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