Misc merge cleanups:
 - move gorillaPicsDir variable into ::gorilla namespace
 - fix some missed old ::gorillaDir variable references
 - change internal version number back to 1.5.3.7