Removed MAKE dependency for npm test.
Merge branch 'develop' of github.com:Gn13l/nextsteps-sailsjs into Gn13l-develop
Merge branch 'develop' of https://github.com/appdevdesigns/nextsteps-sailsjs into develop

Conflicts:
	package.json