Merge pull request #267 from jasnow/master

Updated Gemfile.lock file
Updated i18n
Gem updates
Gem updates
Locked bootstrap to 2.3.1
Gem updates
resync'ed with parent repo