Remove and ignore metadata.json
Remove postgres PPA, we will use our repo
Don't want to actually depend on a site-cookbook; just make sure it's earlier in the run list
Chef 10 upgrade: remove uppercase-block-variable hack
Chef 10 upgrade: missed one more uppercase block var
Remove automatic postgres version setting