fixed wrong resolved merge conflict
Mark two failing "create story" scenarios as @wip

These are failing since the upgrade from jQuery 1.7.1 to 1.11: it
appears type_id is no longer serialized and sent with the Ajax POST
request.

Signed-off-by: Alex Coles <alex@alexbcoles.com>
Revert "Mark two failing "create story" scenarios as @wip"

Fixed in 47b4d783.

This reverts commit 242d74c43fa7e25a199bb3d82347c9804f0a131e.