updated with coming events
Merge branch 'gh-pages' of github.com:sockethub/website-sockethub.org into gh-pages