Fixes for newer rubocop

PR #114 unconstrained rubocop, which upgraded the rules that our ruby is validated against. This caused the Travis build to break. This PR fixes the new complaints from rubocop.