Reset GIT_DIR when calling npm
Merge remote branch 'chrisleishman/git_fix'

Conflicts:
	bin/compile