Got rid of an orphaned TODO
Removed more leftover TODOs
Changes suggested by MarkusHackspacher
Merge branch 'master' of https://github.com/jasongosen/avoid

Conflicts:
	avoid.py