update .aliases
setup.sh: git config
Merge branch 'master' of github.com:Haroperi/rcfiles