adds admin check
minor spelling and wording changes; major change from array_merge back to array +=
adds optimization todo
tightens up set difference tests
tightens up set difference tests
Merge branch 'master' into de-cruft
adds upgrade steps
bumps version