Merge branch 'master' into live
Add ruby version to gemfile
Remove twitter initializer
More transaltions
Merge branch 'live'