Merge branch 'master' of github.com:cboettig/cboettig.github.com