Mostly python additions
Merge branch 'master' of https://github.com/craig-sh/my_settings
update