Fix idiotic change in rails 4.1 with flash keys
Fix deploy.rb git check
Merge pull request #24 from RocketFuelLeak/master

Prod branch update to match staging