forgot to include site/lib/*.js files
incorporating tiny fixes from master