Replaced delegator methods with Forwardable def_delegator in Topic
add a soft puma dependency so people can run Discourse on puma
fix secret_token init to always allow an override even if its too short
mucking with my measure script
saving dialog somehow vanished during refactoring
better error handling for posts that fail to save
update rails 4
ensure you clear the tmp/cache folder on each bench (so results are correct, there is an incompat upgrade)
add facter gem which will be used to collect hardware data from the bencher
update with some facts
Add imagemagick dependency
clockwork is not used anymore
fix user_name_suggester spec
Merge pull request #1400 from eparreno/fix_user_name_suggester_specs

fix user_name_suggester spec
Merge pull request #1399 from ZogStriP/patch-2

clockwork is not used anymore
Merge pull request #1398 from ZogStriP/patch-1

Add imagemagick dependency
Merge pull request #1392 from einarj/use_topic_delegators

Replaced delegator methods with Forwardable def_delegator in Topic
Revert "Replaced delegator methods with Forwardable def_delegator in Topic"

This reverts commit 3ed037940f464bc1ab32c0751dfe7df476ac31cb.
Better API for parsing out blocks in the parser.
FIX: Don't name two routes the same. It breaks in Ember RC8.
Merge branch 'master' of https://github.com/discourse/discourse
Merge branch 'master' of github.com:rux-pizza/discourse