This corresponds to the Gemfile change in a9d281ad.

Allow authentication by HTTP header

Previously, authentication could only be done using a URL parameter,
which appears in various logs. Now, clients can authenticate using a
more appropriate HTTP header.

update to latest newrelic rpm

Revert "Merge pull request #29 from edx/chore/markchang/replace-rvmrc"

This reverts commit d97009d1, reversing
changes made to a9d281ad.

moved to more standard .ruby-gemset and .ruby-version from .rvmrc

Update Gemfile

use ThreadPresenter to render search results

Feature/jsa/new handle threads

additionally, remove unused caching features and update mongo indexing.

remove recursive queries in comment thread views

add simple filtering on inbound content based on a collection of forbidden content bodies

force moped v1.2.1

restore deep search with reindex fix

quick fix to skip the second document reimport when it is *not* necessary (first time index creation).

* properly handle when the index/alias don't yet exist
* don't lose content updates made while reindex/rebuild are in progress
* when possible, use tire api's reindex call for much more efficient index changes
* expose rake tasks to explicitly rebuild or reindex individual types

avoids Moped::Errors::OperationFailure "need to login" in edx loadtest environment

Conflicts:
	Rakefile

restore notifications api post-merge-rollback