merge of SWM phosphate-pack fix to master. Checked integration tests of this fix - changes to swm tests and apparent floating point changes in inverse_rotamer_remodel and match_1n9l