Travis support
Merge pull request #2 from richfitz/master

Travis support