Rubocop fixes
merge changes from tas50 for #133
go ahead and add rubocop to Gemfile
rubocop style fixes, for consistency