Merge pull request #341 from RosettaCommons/jkleman/mp_updates
Jkleman/mp updates:
small updates for membrane proteins:
= changed the scorefunction names to match the one in the supplement for the paper (also changed that in demos)
= changed default thickness for both membrane viewers from 12.5 to 15A (in options file)
integration test changes: expected