Merge branch 'master' of https://github.com/ianweller/python-simplemediawiki

Benjamin Mako Hill || Want to submit a patch?