Minor tweaks to aliases, gitconfig, vimrc, python syntax file
Fix -E flag in sed to -r
Merge branch 'master' into sauron