Embed map fixes

This PR requires Ian's iss-384 branch of opengeo/mapstory