Final commit for Gulp based build system