Merge branch 'master' into vagrant-chef
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
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
Empty commit to trigger CI build.
shift post metadata closer to post
Updated .travis.yml to run migrations
Give regular users a delete button. If they click it, their post will be revised to
say it was deleted.
Delete button on OP deletes topic
Merge pull request #57 from blowmage/user_search_refactor

Refactor UserController#search_users
Site Settings was deleting the wrong cache object
Merge pull request #62 from arikfr/master

Added TravisCI support
a few minor copyedits, 1px adjust