Added smarter history with up arrows.
Merge branch 'master' of github.com:dmorrill10/dmorrill10-setup_dev_environment

Conflicts:
	zshrc