Updated neat to the latest version
Version bump
Merge branch 'develop'
Merge branch 'master' into develop
Merge branch 'develop' into node-sass

Conflicts:
	package.json
Resolved conflicts