Updated git aliases
Merge branch 'master' of github.com:epochblue/dotfiles

Conflicts:
	.gitconfig
Don't auto-copy to clipboard in OS X