2.5dev - merge with EMC and Chuck's code COMPLETE

Finally squashed the last little bug (Operation not permitted when reading empty files).  Regression suite is currently running, will merge tomorrow morning if results look good.