Update gh-pages

[ashawley]

I noticed the gh-pages branch was behind a bit. Looks like there were two commits on top of an old commit of master, 6a57700. One commit was fixing a typo and the other was using the pixyll.com Google analytics code. I'm going to cherry-pick an old commit, e94e862, that adds the analytics code:

commit e94e862d7a9c65a90c427e4cad5999f3f5b02ac8
Author: John Otander <[email protected]>
Date:   Fri Jul 10 16:10:54 2015 -0600

    Add google analytics id

diff --git a/_config.yml b/_config.yml
index d887cf4..257a61d 100644
--- a/_config.yml
+++ b/_config.yml
@@ -7,7 +7,7 @@ baseurl:     ""
 url:         "http://pixyll.com"
 
 # Google analytics
-google_analytics:
+google_analytics: UA-53548208-1
 
 # Optional features
 animated:           false

Then, I'm putting this commit on the top of v2.10.1 tag of master branch which has John's commit that fixed the typo. This will make the new gh-pages branch we can use.

Going forward, we can then just update gh-pages by rebasing it against master every so often:

$ git checkout master
$ git pull upstream master
$ git checkout gh-pages
$ git rebase master
$ git push upstream +gh-pages

This way seems like an easier git workflow. Push-forcing and rewriting git history is usually frowned upon. However, users aren't tracking gh-pages and checking it out, so I think it will be ok to push-force.

If I goof up force-pushing gh-pages, we can roll back to add6ed2, which gh-pages has been stuck on for years. On the chance you had gh-pages checked out, and it's been force-pushed, then you can force the checkout with:

$ git checkout -B gh-pages upstream/gh-pages

[ashawley]

This updated pixyll.com without any problems.

[ashawley]

Closing... the story will probably continue in #388.