major cleaning up, ready for bitters, gulpfile improvements