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.
Merge branch 'master' of git://github.com/gammons/discourse
Merge branch 'clean_up_gemfile' of git://github.com/johnmcdowall/discourse
Update DEVELOPMENT.md

Add missing `git clone` command.
Merge branch 'define_method' of git://github.com/blom/discourse
Disable reply button on archived/closed topics
I thought this would work but it fails horribly Revert "update markdown converter from showdown source, handles trailing parens etc."

This reverts commit e55b713c5920da1d539d51f9cd6ffaad1a1e484e.
Consistency in SQL style
forgot to skip a filter
security hole fixed
Prevent UI from suggesting you can message yourself
Merge pull request #115 from tms/stop-talking-to-yourself

Prevent UI from suggesting you can message yourself
setting to exclude rel nofollow from particular domains
formatting
Merge branch 'master' of github.com:discourse/discourse
Added code climate status image
use link_to to replace a href