Rollback some changes to use a single socket channel
Merge branch 'master' of github.com:scala-developers-bcn/scalabcn-site