Removing 'super secret' bit about keynote, since we've announced it
Merge branch 'master' into gh-pages
Merge branch 'gh-pages' of github.com:whiskyweb/whiskyweb-website into gh-pages