add redacting of user's name from activity log
Add translation to close #867
Added Activity model, ConcertoConfig entry, and cron entry to achieve #871
Update 02-concerto_config.rb
Add conditional for 0 days for keeping activity logs
Found the proper classname to query-but obviously only under newer rubies
Whilst we have no tests for it, this would have been sure to fail under 1.8
Added Gemfile.local to make it easier to install unicorn
requested move to further up in Gemfile
Merge pull request #874 from yakatz/local_gemfile

Added Gemfile.local to make it easier to install local gems.
Merge pull request #873 from concerto/871_purge_pa

Added Activity model, ConcertoConfig entry, and cron entry to achieve #871
Merge branch 'refs/heads/master' into rails-4

* refs/heads/master:
  requested move to further up in Gemfile
  Added Gemfile.local to make it easier to install unicorn
  Whilst we have no tests for it, this would have been sure to fail under 1.8
  Found the proper classname to query-but obviously only under newer rubies
  Add conditional for 0 days for keeping activity logs
  Update 02-concerto_config.rb
  Added Activity model, ConcertoConfig entry, and cron entry to achieve #871
  Add translation to close #867
  add redacting of user's name from activity log

Conflicts:
	Gemfile