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 branch 'master' into fix-merge-again
Fix display issue when reconnecting bitbucket

Per @zwn's comment
Prune vestigial mocks from a test signature
Add a test for the display issue @zwn saw
Fix No button on confirm page; #1462
This allows py.test to run the test suite

There are two main python test runners: nosetests and py.test. We use
nosetests in `make test` but py.test is nicer and we should probably
switch to it (we talked about this a while ago). This small commit makes
the suite pass under py.test.
Merge branch 'fix-for-py.test' into fix-merge-again
Fix test that I broke with the #1462 fix
Merge pull request #1461 from gittip/fix-merge-again

Fix merge again