fix urls
Merge branch 'gh-pages' into genesislive2007-url-fix
also fix the users link that was just added