Better prompt on remote machines, ignore git undo files
Removed work email from gitconfig
Merge branch 'master' of github.com:bricef/dotfiles

Conflicts:
	.gitconfig
Merge remote-tracking branch 'origin/master' into raven