nuke nxhtml
popwin-el
Update magit-mode (and add cl-lib dependency).
Add our subdirs to the start of load-path.
Bump markdown-mode.