Work on getting gulp to run
Fixes to lint correctly
Merge