Final update to 2.0 of repo, looks like everything is being picked up by the server OK.