Acceptance rebase 20140926

These changes patch up some underlying bugs revealed from the rebase, and the tests appear to all be fine, though some of them have to run in isolation, possibly pointing to a problem with the webdriver.
Yes, it's an issue there. Or more accurately, it's an issue waiting to happen there. I can create a PR for upstream.