flatten master

development for the sourcemod plugin should now go in the sourcemod branch.
master will be used for the C/C++ plugin