git aliases
Merge branch 'master' of github.com:rlpowell/config

Conflicts:
	dotfiles/bashrc