Updating site
Merge branch 'master' of https://github.com/cboettig/cboettig.github.com
Updating site