Fixed moinpoin parser+merged into master

I merged the "moinmoin" branch back into master, and fixed the errors in the MoinMoin parser.