Fixes to allow for v2.5 of COIN Cbc
version un-bump in readme
fixed mere conflicts
Merge branch 'master' of git://github.com/cyclus/cyclopts
Merge branch 'master' of git://github.com/cyclus/cyclopts