removed dependency in gulpfile that was causing errors
bumped patch version
fixed merge conflict with version numbers
Merge pull request #22 from ksmithut/develop

Develop