Set locate for Octopress; reflect RVM installation on some hosts.
.
Removed RVM; added blogup
Fix merge conflict