Added a conferencus.com link
Merge branch 'master' into gh-pages