Fixed merge conflicts
Removed fr.yml locale
Removed unwanted spec
Merge pull request #284 from AutoUncle/master

Removed extra locale files (and fixed mere conflicts)