tiny fix
Merge branch 'master' of github.com:otium/node-git-deploy

Conflicts:
	lib/server.js