Merge branch 'master' of github.com:ekg/wikiq

Benjamin Mako Hill || Want to submit a patch?