improvements
Merge branch 'master' of http://github.com/gunny26/python-demoscene

Conflicts:
	setup.py