Testing travis stuff
Merge pull request #37 from kyleabeauchamp/travis

[WIP] Testing travis stuff