update headerfixer
run header tool
Merge pull request #1240 from jrenner/header2

Improvements to header fixer tool.  Ran header fixer.