Updated discorr and warnings from 4.6 free energy merge

This updates the dispersion correction terms in the
reference energy files due to the switch/shift changes
previously introduced in the 4.6 branch, and now merged
into 5.0. The warnings have also been updated to fix a typo.

Change-Id: Idb7fe1498cc7b30f91475efa84db8b917a8b6952