Marriage abroad tool

6 changes to the Marriage Abroad tool (see https://www.pivotaltracker.com/s/projects/537731/stories/63453806)