Caught some minor issues, now fixed.
Merge remote-tracking branch 'Dorkette/gh-pages'