added linemarker directives to error reporting
Merge branch 'pp' of github.com:cyclus/cyclus into pp
Merge branch 'pp' of github.com:cyclus/cyclus into pp
added includes to cli
added cycpp path in highest cmake lists lvl
trying to fix cyclus module macros
fixed some bugs