unset GIT_DIR
Merge pull request #121 from heroku/fixbower

unset GIT_DIR
Merge remote-tracking branch 'upstream/master' into upstream-merge-sept-29

Conflicts:
	bin/compile