fix for https://github.com/Robdel12/DropKick/issues/223
consolidated gulp test runner

fixed tab indent
Updated code
t push origin develop:Merge branch 'cforrester-develop' into develop