Fix gulp task reference
Whitelist main branches on travis
Merge branch 'master' into develop