fixing whitespace
removing br tags and reordering empty header sections at top
Merge branch 'master' into gh-pages