stash initial datacontext work
finish datacontext fixes
Merge branch 'datacontext'
v0.1.25; more data context tests and fixes.  last time i think.