update modes
Merge branch 'master' of github.com:thurn/dotfiles
Merge branch 'master' of github.com:thurn/dotfiles

Conflicts:
	emacs/final/z1_modes.el