Set up BBDB integration with Wanderlust.
Merge branch 'master' of github.com:jezcope/dotfiles

Conflicts:
	emacs.d/init-main.org