merged list aliases
merged vimrc from master
gitconfig merged from master
win aliases
colors for win
merged with master
Merge branch 'master' into win
iis alias
Colors for python