Bug 897082 contact and spaces

Still a few copy edits incoming and likely some other small tweaks, but we can get started on code review now. And we'll of course be squashing this before merge.