Updating master (local) with remote. This merges a fix for the membrane_ddG test (turned off) and also turns off the lipid accessibility file reading unit test (which will also be fixed in a commit soon to come. Nothing in the build should change here.