updating ui pragma notes for facilities
updated pyne
added readme about installing from conda
Merge pull request #1012 from scopatz/pyneup

updated pyne
grate success
Merge pull request #1013 from scopatz/inst

added readme about installing from conda
use Json::CustomWriter to produce nicer looking JSON strings
Merge pull request #1014 from scopatz/cw

Use Json::CustomWriter to produce nicer looking JSON strings
Merge pull request #1015 from FlanFlanagan/develop

updating ui pragma notes for facilities
added ability to alias variable names to something else in the schema
added a few tests for aliasing in code generator filters
Merge pull request #1016 from rwcarlsen/alias

added ability to alias variable names to something else in the schema
blah
Updating the sink agent annotations to match cycic annotations
fixed indenting on source facility pragma
Merge pull request #1018 from FlanFlanagan/develop

Updates to uitypes for cyclus agents
adds an optional text-only ui node inside the simulation node in both cyclus schema files. this should be an initial fix for @flanflanagan's issues.
Merge branch 'gidden-ui' into develop
LAZY to NOW
removed print debugging