No autodie plus startup diet

This is a merge of #23 and #25.  I did it to see what the combined performance increases were.  Load time reduced from 100ms to 30ms vs master.  Test runtime reduced from 1650ms to 1050ms vs master.

There were merge conflicts, so I'm putting it up as a pull request so you don't have to redo that work.