Clean up working directory; add support for non-PBJ sites
Bump version number to v2.1.0