Use ERB when importing conf files into app
Drop Rails3 support
Merge pull request #1968 from stephankaag/drop_rails3

Drop Rails3 support
When entering a topic, place the desired post in the middle of the page
Have keyboard_shortcuts use Discourse.TopicView.jumpToPost

Instead of _scrollList, which is more appropriate on the topic list.
BUGFIX: rails 3 removal downgraded message bus
Add some Ruby 2.1 specific Gems, get people to upgrade bundler
Added markov emoji for turtle rock
PERF: stop messing with strings that come back from I18n.t

allows better caching
Update unicorn to latest
Add oobgc compatible with Ruby 2.1
FIX oobgc support for Ruby 2.1
move patching to better spot
Update Gems
fix up gemfile
BUGFIX: seen recently key needs to be public so mock can easily reach in to it
Merge pull request #1969 from riking/scroll-position

Put requested post in middle of page
Merge pull request #1951 from thoughtbot/bb-erb

Use ERB to pull conf files into app
hold back image optim due to svg issue
FIX: show ip address with mask again on /admin/logs/screened_ip_addresses