Misc stuff.
Stuff
Merge branch 'master' of github.com:kirkland/myconfig

Conflicts:
	dotfiles/zshrc
Fix relative line numbers