Update files to use ruby 2.1.1
Rubocop clean-up & test winnowing

* Cleanups to formatting etc. to make RuboCop happy.
* "Extra" tests removed now that working code is in place.