Changed .gitignore to ignore the shell history files.
Merge branch 'master' of https://github.com/robertutterback/configs

Conflicts:
	.zsh_history