Merge remote-tracking branch 'upstream/master'
Update puma and sidekiq
Add new locales, adjustments to footer
Merge pull request #167 from robotmay/locales

New locales and a few updates