cleaned up travis config
Merge branch 'master' into skip-followlocation