Merge pull request #77 from jamesongamble/master

Attempts new travis approach
Tweaks last travis approach