Changed espresso.py to check for a finished calculation
Merge branch 'master' into niflheim
Revert "Merge branch 'master' into niflheim"

This reverts commit 1f07bfe66f5e086d89cece1f9e2e57421c38ce7f, reversing
changes made to 2300d1db25cfaaa76d2513b4c095ba39adc342a8.