Fixed issue 11
More travis testing
Merge pull request #10 from emersonveenstra/test-stuff

More travis testing