updated readme to describe reasoning behind material spec. I'll work my way through the rest.
updated gitignore
Revert "updating work"

This reverts commit 13b9ac4bdecb59b59fb8d6b8423cf96d03a7338b.
Revert "Revert "updating work""

This reverts commit bfeda4f78354a33e91ac34c39918019b1f3afcad.
Merge branch 'master' of github.com:gidden/benchmarks
basic testing structure provided
updated testing framework. I now test for object similarity, rather than string similarity. current representation of testing xml and json objects complete, time to write translation function
moved json parsing into its own class which has a parse method. the actual guts are implemented as private functions. the parse method returns a list of cyclus material objects that hold the name of the material and the xml interpretation
material translation now supports materials given as recipes. tests run and pass.
updated tests to now check for non-recipe compositions and input lacking compositions
updated gitignore
updated readme to describe reasoning behind material spec. I'll work my way through the rest.
this patch introduces a material parsing class to provide translation from json materials defined as specified in the readme to cyclus xml materials. tests included.
fixed some tabs/spaces, and moving this work into its own branch, moved parents into an optional attributes parameter
added a section for repositories
finished a rough draft of the facilities section. specifications have been given for all facility types, and examples have been provided for those that we've implemented already
merging readme updates for materials and facilities
updated the material parser to be instantiated with a single material object rather than returning a collection. also updated tests to correct call the assert_raises function
Merge branch 'matl_update'
added basic structure of facility translation with corresponding tests