travis ci integration
Merge pull request #2 from Rmarmorstein/master

travis ci integration