fix lookup of geo model - don't use globals
add 'year' field to demarcation models, only 2011 data for now