Rubocop: Fixing failures
Merge pull request #58 from daviddavis/temp/20140214154118

Fixing rubocop failures
Merge remote-tracking branch 'upstream/master' into cv-merge-mast
Merge pull request #59 from daviddavis/cv-merge-mast

Merging master