Issues/863 makemyisland changes

MakeMyIsland is effectively in production, so it would be nice to no longer be running this on its own branch