Married couples allowance amends

https://www.pivotaltracker.com/story/show/40851063