Remove some header clutter
Merge branch 'gh-pages'