bbdb 3.1.2
Merge branch 'master' of github.com:dhaley/dot-emacs