fix previously uninitialized zero sim-id for parent sim
Merge branch 'simid-fix' of https://github.com/rwcarlsen/cyclus into simid-fix
gets around an unparsable boost lib.
updated to pyne
Merge pull request #850 from scopatz/pyne-up

Updated to PyNE v0.4
added annotations code generator
added cli for getting annotations
Merge pull request #854 from scopatz/anno

Annotations
Merge pull request #846 from scopatz/simid-fix

New Simid fix
short-circut annotations
updated cycpp unit tests for code gen filters
Merge pull request #855 from scopatz/snip

Short-circut Annotations
mv cycluscore -> cyclus
Merge pull request #858 from scopatz/rm-core

mv cycluscore -> cyclus
children from vector->set, closes #344
src/test requests to pointers
requests are now pointers
updated integration test agents
bids now use only pointers
Merge branch 'rbptr' of https://github.com/gidden/cyclus into gidden-rbptr