fixed merge conflict
fixes gulpfile and minor syntax errors
Merge pull request #6 from biversen21/master

fixes gulpfile dependency order and minor syntax