clean up translation plurals for #888
Merge branch 'master' into i18n_plurals

* master: (30 commits)
  Fixing #949 by removing pirate files
  Pass all tests
  Fixed model method calls
  Add i18n missing keys rake task
  i18n english translations
  As of cancancan 1.8.2, tests pass - closing #943
  remove extraneous rake task
  i18n updates
  Finally found the critical syntax error...
  Found another trixy syntax error
  Fixed some syntax
  destroy children when content is deleted
  fix crash in weighted shuffler when content with id does not exist
  Reverted i18n commits and moved to branch
  fixed more interpolation fails
  fixed interpolation fails
  i18n - models pt. 2
  i18n - models
  fixed more interpolation fails
  fixed interpolation fails
  ...

Conflicts:
	config/locales/views/groups/en.yml
	config/locales/views/users/en.yml
clean up activity mailer translations for #838
use correct english plural forms
Merge pull request #952 from concerto/i18n_plurals

I18n plurals