Merge branch 'develop'
Adds additional gulp watches.
Version bump.
Merge branch 'master' into develop