More to test travis + some gulp tasks
merge fix