major reorganization for 2.0
further patches for py3x
Merge branch 'master' of github.com:dmeliza/toelis

Conflicts:
	toelis.py