getting comfy
remove some unused settings, change history-substring-search colours
Merge branch 'master' of https://github.com/sorin-ionescu/prezto

Conflicts:
	runcoms/zshrc
add git module
remove iTerm2 tmux options
add new git aliases, remove unused aliases. setopt NO_FLOW_CONTROL