Cleanup and update to rspec 3
Add config for travis-ci