Merge branch 'release-1.5.1'
Merge branch 'release-1.5.2'

Deployment steps:
1) rake db:migrate
2) rake tagteam:update_tag_count  #runs async, but will take a while to finish
3) Done.
Revert "Merge branch 'release-1.5.2'"

This reverts commit d8bdcc4b424d0a8a81e86bf95677ed57715dbaad, reversing
changes made to d69fc597b36bbcde35082b907e72f43cda92881d.

This version was pretty buggy.
Merge branch 'master' into dev
update gems
addresses #7615
addresses #7619
addresses #8152, #7837