updating ui pragma notes for facilities
rm'd some ws
Merge branch 'gidden-sha' into develop
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
This commit adds the ability for exchange groups to add either GTEQ or LTEQ constraints. Previously, request constraints were assumed to be GTEQ constraints and supply constraints were LTEQ. Requesters could now add LTEQ constraints to the DRE limiting a value (e.g. Pu concentration) given their request. This API has *not* yet been exposed to the higher-level CapacityConstraint class, only to the RequestGroup/ExchangeNodeGroup classes at the ExchangeGraph level.
this now provides an API to expose the top-level capacity constraint to the capacity types
added a warning to the greedy solver
added 1% ratio gap allowable to cbc CLI args
ratio gap to 10%
ratio to 0 for testing