Add host to bash prompt.
Git stuff.
Vim stuff.
Merge branch 'master' of github.com:thesealion/dotfiles

Conflicts:
	gitconfig