Asorted changes. Don't really care to enumerate. Use diff.
Merge branch 'master' of github.com:Reyu/prezto

Conflicts:
	runcoms/zpreztorc