Merge branch 'master' into vagrant-chef
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`.
Extracted default value initializers.
simplify faq/tos/privacy HTML and CSS
normalize on H2 in FAQs, copyedits
minor /faq improvements, Omit Needless Words
correct TOS links, correct ul/li body-page style
li height, copy on /faq
Omit Needless Words, again
edit id anchors on /faq
correct noscript link to next page
factor out @post.revise into its own class.  clean up PostRevisor class to be more readable
Merge pull request #91 from kubabrecka/upstream

correct noscript link to next page
Merge branch 'master' of git://github.com/gammons/discourse
Merge pull request #92 from gammons/master

Factored out @post.revise into a new PostRevisor class
Consistent use of Ruby 1.9 hash syntax, consistent use of apostrophe delimeter, grouped by reference type and alphabetized within
Merge branch 'clean_up_gemfile' of git://github.com/johnmcdowall/discourse
Merge pull request #93 from johnmcdowall/clean_up_gemfile

Consistent use of Ruby 1.9 hash syntax, consistent use of apostrophe style
Add mailcatcher instructions to DEVELOPMENT.md