Add IRB history
Use Kaleidoscope
Add heroku toolbelt to path
Specify which key for load_keychain
Merge branch 'master' of github.com:jage/home

Conflicts:
	.gitconfig
	.zshrc