Removed codeclimate stuff from spec_helper
Merge branch 'master' into rails4