spec fixes, cleanup
travis config