Merge branch 'master' of https://github.com/mehan/based-poetry

Conflicts:
	based-poetry.py
	chopper_class.py
	chopper_class.pyc
cleaning up
more clean up
removing extra user agent lines
fresh repo after cleanup