Merge branch 'patch-2' of github.com:nemobis/wikiq

Benjamin Mako Hill || Want to submit a patch?