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.
Yup, I think so too - in any case we'll figure it out when discussing the PR with upstream on this, they probably haven't considered the case of forks, although I imagine this would be a pain for upstream too, to have to update it whenever a change is made.