Another step in the data_store refactor to support auto instancing.
Merge branch 'master' of https://github.com/jwb1/electroslag
Linux build work.