Add some history
Merge branch 'master' of https://github.com/christianbundy/dotfiles

Conflicts:
	dotfiles/zhistory