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

Fixing rubocop failures