Merge branch 'release/v0.12' into develop
Merge branch 'master' into develop
Fixed site.

NOW we're getting somewhere with jekyll.
Merge branch 'develop'