Faster variable container

Replace OrderedDict with a more efficient container for variables and constraints.