Fixing rubocop complaints, adding rubocop to travis
Merge pull request #221 from fh/t/rubocop

Fixing rubocop complaints, adding rubocop to travis