Modified ResorceFinder to look for new 'context' directory; couple of bugfixes for gybuilder