Fix for namespace linking and unlinking issues

This should resolve issue #181 which highlighted problems with linking or unlinking Class/SuperClass/Object Name/C++ Class namespaces to each other.

Some minor formatting (4 space) corrections mixed in.