WIP
Merge branch 'master' of github.com:sethmcl/node-workspace

* 'master' of github.com:sethmcl/node-workspace:
  WIP

Conflicts:
	lib/util/git.js
WIP