Updated factory girl and collection matchers gem to latest
Remove i18n warning
Cleaned up the JS a bit, better compatibility with firefox