Merge git://github.com/esby/mw

Benjamin Mako Hill || Want to submit a patch?