Updating rubocop and ruby version + addressing rubocop offenses
Merge pull request #60 from modcloth-labs/rubocop-touchup

Updating rubocop and ruby version + addressing rubocop offenses