fixes for rspec deprecations & travis 1.9 build