Merge request

Ok, I hope this is the right merge request now.......
Anyways, the plugins in here are all functual, and it has the client-side ignoring.

EDIT: gwah, i think it is the wrong thing again -.-

I can't get this working..... :(