Update travis
Merge branch 'master' of github.com:encharm/http-master