updated readme and makefile to use an origin(your fork)/upstream(cyclus) workflow. feel free to reject his PR if you disagree.
Merge pull request #27 from gidden/remote_fix

updated readme and makefile to use an origin(your fork)/upstream(cyclus)...
started CEP2
more text for cep2
minor cep2 updates
removed protected/private interfaces from proposal.  Revised/simplified resource class to be pure abstract. Extended compmath namespace. Other minor changes.
Merge pull request #30 from rwcarlsen/cep17-rev4

cep17 final draft revision...
Merge branch 'source' of github.com:cyclus/cyclus.github.com into source
added concerns image
some cep updates
more source stuff.
added projects image
CEP 2 draft ready
final minor api tweaks
Merge pull request #31 from rwcarlsen/cep17-final

final minor api tweaks
changed SD -> DRES
Merge branch 'source' of github.com:cyclus/cyclus.github.com into source
Added toolkits to cep2
fixed typo