Ugrading to ruby version 1.9.3-p374
Merge branch '2.1' of github.com:imathis/octopress into 2.1

* '2.1' of github.com:imathis/octopress:
  Transition missed _config.yml changes to new _config files