Manually merged some of Tyler's bug fixes, as well as changed some minor things.
Renamed some poorly named variables.
Comment fixup
Merge branch 'master' of https://github.com/Granary/granary

Conflicts:
	.gdbinit
	clients/watchpoints/user/posix/signal.cc