modified package.json for nodejitsu
Merge branch 'master' into develop

Conflicts:
	package.json
Merge pull request #7 from ignacio-valdivieso/develop

Develop