Merge branch 'master' of github.com:johnmcdonnell/prezto
Merge branch 'master' into archlinux