Fix specs and minor cleanup

This fixes the tests and adds more ruby versions to travis.

It also removes deprecated, redundant and unused code.