Catchup gh-pages up with master?

Origin master is 7 commits ahead. I think it's mostly related to gitignore stuff, but I'm not really sure what will happen if I do this pull request. Locally, both branches match and have been pushed to origin and test so I'm not sure what this. I'm afraid to merge it.

GH-pages is the local branch I've been working off of, but now that the site's live, that branch should be deleted.

I'm going to leave both as they are for now, but eventually they should be caught up.

Gonna think about it a bit.