docs and modifications for peg macros
Merge branch 'master' of https://github.com/lihaoyi/macropy

Conflicts:
	macropy/run_tests.py