Mapvote modifications

Allow alternating mapcycle and mapvoting.