Travis file and build badge
Merge branch 'master' into write_some_tests