add missing comma...
Merge branch 'master' into pulp
undo last commit
Merge branch 'master' into pulp

Conflicts:
	polytope/__init__.py