suppress cbc output
Merge branch 'gidden-cyclopts' into develop
Added syntax error for malformed #pragma cyclus directives
Merge pull request #986 from scopatz/synerr

Added syntax error for malformed #pragma cyclus directives
fix bug where last snapshot wasn't being recorded in db and time incrementing subtly wrong
added some snapshotting tests and fixed Timer EarlyTerm test by doing time_-1 as sim EndTime for final record
bumping number of warning up
add tcmalloc optional link to cmakelists
add tcmalloc note to readme
Merge pull request #990 from scopatz/bump-warn

bumping number of warning up
remove header from FindTcmalloc
Merge branch 'rwcarlsen-snap' into develop
add tcmalloc optional link to cmakelists
add tcmalloc note to readme
Merge branch 'tcmalloc' of github.com:rwcarlsen/cyclus into rwcarlsen-tcmalloc
Merge branch 'rwcarlsen-tcmalloc' into develop
fix for CYCLUS_ROOT_DIR, closes #993
fixed endif
fixed indentation
Merge pull request #994 from scopatz/cycroot

fix for CYCLUS_ROOT_DIR, closes #993