Switch Expecta submodule back to mainline, as my patches there have been merged