Fix
Merge branch 'feature_travis' of github.com:nhaarman/DashPinkpop into feature_travis