Fix all the trailing whitespace
Merge branch 'master' into vagrant-chef
Merge pull request #12 from darthdeus/fix-all-the-trailing-whitespace

Fix all the trailing whitespace
fixing spelling error
Oops, slim is required for sidekiq's web interface.
Add test coverage for UsersController#search_users
Extract search logic to UserSearch model
Extract SQL generation method
Return User objects instead of hashes
Remove expectation of term case
Refactor UserSearch tests
Added the link to the Discourse development forums
Merge pull request #59 from ZogStriP/patch-1

Added the link to the Discourse development forums
Changed Discourse CLA link to the canonical one
Merge pull request #60 from ZogStriP/patch-2

Changed Discourse CLA link to the canonical one
Merge pull request #58 from tjstein/master

Fixing spelling error in public/500.html
Merge branch 'master' into vagrant-chef
Use chef-solo to install phantomjs into Vagrant VM.

This introduces two configuration management runs into the
Vagrant provisioning phase. The first chef-solo run ensures that
a current version of chef is installed using the omnibus updater.
The second chef-solo run installs vim and phantomjs.

Much more is possible, this is a proof of concept.
Cookbooks are stored in the chef directory, and managed by
librarian-chef, which is like a bundler for cookbooks.

Chef is run when VM is first downloaded and booted, but not on
subsequent halt/up cycles. To force chef to run again, use
`vagrant provision`.
Added TravisCI configuration file
need break-word on user page excerpts