Add _site to gitignore.
Merge branch 'master' into gh-pages