I hate jekyll
Merge branch 'master' of github.com:scala/scala.github.com
Trying to get site generating again