Merge branch 'master' of github.com:ianweller/mw

Benjamin Mako Hill || Want to submit a patch?