Improved python builder--still probably not ready for primetime.
Merging in python builder improvements.