fix link and clean up HTML
Merge branch 'master' of github.com:glind/OSCON2014
cleanup
Merge branch 'master' into gh-pages
Merge branch 'gh-pages' of github.com:glind/OSCON2014 into gh-pages