Remove globcomplete.
Merge branch 'master' into twitter
Change prompt.
Merge branch 'master' of github.com:edma2/dotfiles
Merge branch 'master' into twitter