Cleanup for newest rubocop suggestions
Set the next release version number
travis.yml tweaks to help simplify testing