Bundle update
Update ruby 2.1.5
Turns out we can't be that up to date and use build-packs
Why wasn't this checked in?
[#79548718] Refactor grouping emailers list to live on grouping model.
[#79548718] WIP
[#83358582] Use recursive distinct for more queries, remove 'hot'
[#79548718] Add mailer for new notes
Merge branch 'cc_email_on_notes'
Derp
Detect broken semaphore usage in GroupingNotifier's semaphore, make sure we pass in an integer timeout.
derp
Daemonize puma and sidekiq
More correct puma.rb for listening to sockets
Merge branch 'master' of github.com:cconstantine/wattle

Conflicts:
	config/puma.rb
Don't daemonize
Use heroku style DATABSE_URL for production db config
sidekiq thingies
pids go in tmp/pids
Set db connection pool size to 26 for production

25 sidekiq threads plus 1 for sidekiq master