Merge pull request #1744 from RosettaCommons/dougrenfrew/optE_override Adding additional overrides to OptE code when compiling with MPI