Fixing travis
Merge branch 'master' of github.com:mzimmerman/whitelistproxy