Here's a failing test for the merge workflow

Merging regressed in #1320.
Fix merge UI

This regressed with #1320.
Add minimal coverage for on/take-over.html.spt
Merge pull request #1433 from gittip/fix-merge

500 signing in with Twitter