Merge branches 'python' and 'master'
Merge branch 'python'
different colors for edits that are latest
clean up