Remove a bug (if -> when)
Add commands to add a list item in markdown-mode
Merge commit 'd759bab'

Conflicts:
	inits/cocoa-emacs-init.el