Added travis config
Added travis ci badge to readme
Merge branch 'add-travis-ci'
Updated travis branch badge
Minor tweaks to setup.py
Minor formatting tweak
Version bump - minor non functional changes
Merge branch 'minor-tweaks'