Chore/update build

clean up the gulpfile somewhat, and clear up the build flow.