Rubocop: Relaxing checks
Merge branch 'temp/20130829075020' into rubocop-controllers
.