update travis
Merge pull request #13 from boiving/master

Travis