Upgrade rails
Turn off comment navigation, etc.
Merge branch 'master' into production