update travis
Merge branch 'master' of github.com:madeye/proxydroid