AUtocompletion improvements.
Merge branch 'master' of github.com:bnolan/beervana