Jekyll 2 compatibility

As reported by @mariansollmann jekyll 2 was released.
I experienced some problems on the weekend building this site, probably because of that.
@christopheschwyzer can you look try it out with the newest jekyll?
To update:
```
gem update jekyll
```