Updates to Headwaters
Merge pull request #20 from oakleyb/gh-pages

Headwaters changes