master as of 6-Jul-2014
more reorganization tweaks
vector basis theorem
conference additions