Fixed broken CCENERGY bypass SCF option.
Merge branch 'master' of github.com:psi4/psi4