Don't load org-octopress on Windows
Merge branch 'master' of github.com:rxacevedo/emacs.d