Use SiteModel instances when loading sites from disk.

This ensures that as we add features later the older sites will have
sensible defaults instead of having to guard against "undefined".