Better x_map, allowing for multiple mappings to same data
Added how option to resolution_series_min_week
Fix tests for x_map change