updates to get python working
Merge remote-tracking branch 'origin/master' into kofihorse-mods
merged origin & tweaked for local