Fixed up some alignment issues with the text.
Merge branch 'dev' into gh-pages