Merge branch 'master' into gh-pages

Conflicts:
.gitignore
index.html