Second pass at marriages
Merge branch 'master' of github.com:FreeUKGen/MyopicVicar

Conflicts:
	spec/models/freereg1_csv_entry_spec.rb

Hand-merged conflicts due to refactored location of RecordTypes