MERGE master into gh-pages, don't rebase it.
MERGE master into gh-pages, don't rebase it.

This should avoid all those crazy rebase conflicts, and hopefully keep
the history more in-line.

danbernier/WordCram,danbernier/WordCram,danbernier/WordCram