- travis update
Merge branch 'master' of github.com:aliceinwire/overlay