Merge branch 'release/1.1.5' into develop
Small fixes to improve deployment.
Update rails to 3.2.18 and some other gems.
Remove Heroku mention from README - website was moved to VPS a while back.
Merge branch 'release/1.1.6'