Fix for issue #116 (new branch/squashed commits).

New branch created from three squashed commits in previous/original gh-pages branch pull request I made previously. Should make the merge look much cleaner.