Fix some typos in userguide.txt, and re-remove spaces in macro definitions.

The spacing in `#define FOO(x,y,z)` is our idiosyncratic uthash style,
and I actually think it looks better in this case anyway.