Merge pull request #5 from jasnow/master

Got rid of i18n warning; Removed trailing white space; Rebuilt Gemfile.l...