Refactorcop refactors

This could be a work in progress, please contribute to this branch if you want to address these issues one by one:

http://www.refactorcop.com/refinery/refinerycms