Removed apel.
Disable bbdb and sicp.
Added erc from git and tried to get google-maps to play nice with org mode.
Merge branch 'master' of github.com:russell/dotfiles

* 'master' of github.com:russell/dotfiles:
  Use helm for M-x
  Disable ido extensions.
  Added some simple erc notifications.
  Added dunstrc.
Merge branch 'master' of github.com:russell/dotfiles

* 'master' of github.com:russell/dotfiles:
  added helm autocomplete for lisp modes.
  Added woman customisation.
  Fixed some problems.
  Added custom ido-helm-mode, to enable ido-hacks with helm-M-x
  Fixed newline and indent.
  Added dunst.

Conflicts:
	emacs.d/init-mode.d/30-el-get.el