Merge branch 'develop'
started working on automated dev env
ready for git download test
ready for clean test
added much much better gulp driven node env
Merge branch 'feature-build'
fixed merge conflicts
possible fix for unix and windows issues, updated to new env