Code cleanup (Fix gulpfile)

Just setting up for some more refactoring.