Rename postgresql and postgis states to include version number. Adds exclude rules to prevent pgdg and elgis from being used at the same time