cleanups, site config not in doc root, fix bundler version, FIXMEs