Fixed bugs associated to Tools

A number of namespace bugs have been fixed so the plugin should be playing nicely within WordPress again.