some cleanups for building without collab.
Merge pull request #1695 from fontforge/monkeyiq/2014aug/collaboptionalcleanup1

some cleanups for building without collab.