Fix remaining merge comments.
Merge pull request #4 from chasballew/gh-pages

Fix remaining merge comments.