travis
Merge pull request #2 from sprestel/travis

travis updates