Python updates

Rebase python branch off of master and add back python files...