minor formatting
more minor formatting changes
Merge branch 'gh-pages'