updates
Merge branch 'master' of https://github.com/fogleman/pg

Conflicts:
	pg/core.py