Formatting tweaks
More formatting tweaks
add travis
Wrong travis file
Merge branch 'develop'