Merge pull request #91 from jamesongamble/master

Tweaks last travis approach
Continues tweaks