Lots of reworking input structure
Move benchmark file into tests.  Not really sure where the best place for this is, but I don't think it's in the burnman directory
Forgot these changes
Merge pull request #2 from ian-r-rose/cleanup_imports

Cleanup imports