Tidy up comments
Add travis badges to README.md