Fix nodePath migration
Merge branch 'master' into gruntify

Conflicts:
	.gitignore