Brought namespacing into line with conventions and updated rspec tests.
Update travis.