Merge branch 'johnnyshields-master'
Merge branch 'master' of github.com:lgs/mongoid_taggable_with_context