dev: General improvment and tidy up
dev: master merge
Merge pull request #8 from ben-gibson/feature/add-travis-settings

dev: General improvment and tidy up