Moved things about
Minor updates.
Fixed merge error
Merge branch 'master' of github.com:ngcrawford/pypgen

Conflicts:
	.gitignore