Working to make Rubocop happy and to build on Travis.