Allow $EDITOR to be set up elsewhere
Merge branch 'master' of https://github.com/holman/dotfiles
Fix syntax error
Merge remote-tracking branch 'upstream/master'

Conflicts:
	system/env.zsh
set xterm-256color when possible