initial commit with python 3.0 cleanup
Merge remote-tracking branch 'origin/master'