fix link and clean up HTML
Merge branch 'master' of github.com:glind/OSCON2014