Merge pull request #22 from RocketFuelLeak/master

Fix idiotic change in rails 4.1 with flash keys
Merge pull request #23 from RocketFuelLeak/master

Fix deploy.rb git check
Update simple_form
Merge remote-tracking branch 'origin/staging' into develop
Update forms for new simple_form version
Update addon form for new simple_form version
Add email_off comments in userlist for cloudflare
Gem updates
Merge branch 'master' into production