new material db form
fixing conflict
New material DB format.  The new version is much easier to read and follow.

It seems it would be pretty easy now to transition away from needing to
run the setup.py script.