fix deploy stuff
bump fix
Merge branch 'master' of https://github.com/Unitech/pm2 into nocolor

Conflicts:
	package.json