Minor tweaks

Use $(...) instead of backquotes which is not only POSIX-compatible but
is way more readable and nests properly.
Be more generous with quotes (just in case) and less generous with backslashes.
Merge remote-tracking branch 'holman/master' into syntax

Conflicts:
	script/bootstrap
Merge pull request #144 from kirelagin/syntax

Minor tweaks