Fixing json formatting
Merge branch 'master' of github.com:bpartridge83/sails

Conflicts:
	package.json