Including gulpfile & Minor changes