Re-enable hooks and comment out problematic tostring stuff
Merge remote-tracking branch 'origin/hf_windows_tostring' into hooks_and_build

Conflicts:
	src/utils/tostring.cpp
merge with master
Merge pull request #164 from voxelinc/hooks_and_build

Re-enable hooks