Merge branch 'master' of github.com:clearwater/octopress
Merge branch 'master' into gaugette