Move to gulp, bug fixes and updates