master
Store locations in ReferenceLists so they can be converted to locators.
cleaned up conditional module a bit; add test for conditional module