travis integration
Merge pull request #1 from revington/travis

travis integration