prevent infinite recursion
temporarily disable cms and firms
improve firm name detection, remove unnecessary regex
Merge branch 'newfirms' of github.com:glg/insite into newfirms