Merge remote-tracking branch 'upstream/master'
Locale updates
Prevent NSFW images from showing up in collection unless requested
Improve comment notifications in case of deletion
Update rake gem
Fix for collections controller specs
Merge pull request #214 from robotmay/hotfixes

A couple of hotfixes and updates