20131019
Merge branch 'master' of github.com:edoburg/dotfiles

Conflicts:
	.zshrc