Fixes some parsing problems caused by kramdown switch
Merge branch 'master' of github.com:scala/scala.github.com