Minor dotfile changes.
Merge branch 'master' of github.com:mwhoffman/config

Conflicts:
	dotfiles/bash/prompt
Add back in link script.