Merge branch 'master' of github.com:slaxor/dotfiles
Add home/.bashrc.d/aliases.sh to .gitignore