Bunch of miscellaneous changes.

Ended up nuking my python config b/c its a major pita to make work with python 3.