Updated README for test instructions
Simplify gulp file
Simplify gulpfile
Fixed test-quick
Merge