Minor tweaks.
Merge branch 'master' of github.com:morphling/.dotfiles

Conflicts:
	emacs.d/init.el
Ace jump mode.