Require socket so that running the lib tests alone don't fail with uninitialized constant SocketError
Twitter should have a capital T

and remove parentheses that be reworded to a real sentence.
Merge pull request #567 from colindean/master

Twitter should have a capital T
Merge pull request #569 from mathias/empty_search_for_authors

Short circuit empty search query to show all users
Adding our two newest contributors, mathias and thomaslee!!! :heart: :heart: :heart:
Upgrading ratom with my bugfix to my bug!! Fixes #559.
remove old username error/reset templates

Fixes #589.
Merge pull request #590 from colindean/feature-remove-old-username-error-views

remove old username error/reset templates
Adds a javascript engine to avoid errors running tests.

On Linux, a javascript engine is required to run the tests. So, I just
added one to the tests subgroup of the gemfile. It won't hurt
production, but it is annoying to have to add this manually every time I
want to run the tests. :(
Adds salmon links to xrd.

These endpoints are completed in the routes, but without them in the
xrd, no ostatus client would know how to reach an rstat.us node user.
That would make me sad. All three links are required, but normally they
all point to the same route. This is true for us and status.net, so
don't be alarmed by it. I'm not sure why anybody would want to
distinguish them by route since the envelope exposes this, and this
distinction does not make it a separate resource at all. :(
Adds soft version specifier to therubyracer.
Documenting our Brand New Commit Bit Policy!
Wrapping the README at 80 chars
Merge pull request #594 from wilkie/bugfix/javascript-engine-in-gemfile

Adds a javascript engine to avoid errors running tests.
Clarifying policy in regards to branches other than master
Initial stab at fixing #592.

Need feedback on how to test
Removing commented out lines in xrd.haml.

Let's use source control!
Adds tests to ensure that the salmon urls exist in the user xrd.

I added a section to the webfinger tests which test that the xrd served
by a webfinger request contain the three salmon urls necessary to get
salmon notifications. Again, the three are not necessary, but it is nice
to provide all three even if they are the same url.

I will add more tests for the remaining things in the xrd to this set of
acceptance tests.
Fully qualified name for ajax replies (#592)
Extract remote? method