Made sure we are testing against disability not some unknown value
Delete a contacts locations when that contact is deleted.
Merge branch 'master' of github.com:DirectEmployers/MyJobs into contacts-multiple-locations
Merge branch 'contacts-multiple-locations' into contact-location-model
Merge pull request #913 from DirectEmployers/contact-location-model

[PD-629] Adds Location model
Merge branch 'contacts-multiple-locations' of github.com:DirectEmployers/MyJobs into contacts-multiple-locations
Merge branch 'master' into contacts-multiple-locations
moved location of label column so forms display correctly
Merge branch 'contact-location-model' into contacts-multiple-locations
Merge branch 'master' into FEATURE-multiple-locations
Merge branch 'master' into FEATURE-multiple-locations
Merge branch 'FEATURE-multiple-locations' into remove-address-fields
Locations only deleted if they aren't associated with any contacts