Updating to new PSI4 cmake system.
Merging.
Merge branch 'master' of https://github.com/lothian/ugacc