Merge branch 'release-2.0'
Merge branch 'develop'
Merge branch 'develop'
Log swErr to circular buffer rather than truncating buffer
Merge pull request #2 from circular_logs to develop

# By Matthew LeGendre
# Via Matthew LeGendre
* commit '7523fbc22ac99c91111e08d55b2e04522d467a93':
  Log swErr to circular buffer rather than truncating buffer
added signal handler to debug STATD crashes
code style police
Fix bug with mapping errors to incorect ranks under GROUP_OPS
Merge pull request #3 from err_node_mapping to develop

# By Matthew LeGendre
# Via Matthew LeGendre
* commit '19688155464bd856467d309143e08e914640562e':
  Fix bug with mapping errors to incorect ranks under GROUP_OPS
updated ChangeLog w/ error labeling fix
minor BlueGene edits + update source links
fixed bugs in handling of missing ranks
added DysectAPI
removed BGQ FGFS workaround
write to .perf file after every merge
make -c default option, disabled with -t -P or -i
Merge branch 'master' of https://lc.llnl.gov/stash/scm/stat/stat into develop
Added timeouts for error detection during stackwalking phase
Merge pull request #4 in STAT/stat from sw_timeouts to develop

# By Matthew LeGendre
# Via Gregory L. Lee (3) and Matthew LeGendre (2)
* commit '704aad16d6ac1d8eec5d45480ac72b482a203f5d':
  Added timeouts for error detection during stackwalking phase
Merge branch 'develop' of https://lc.llnl.gov/stash/scm/STAT/stat into develop
slight style edits
merge of ChangeLog
Conflicts:
	ChangeLog