Removing .rvmrc
Using .ruby-version instead of .rbenv-version
Merge pull request #919 from imathis/unified-rb-vers

Unified .ruby-version file
Merge branch '2.1' of git://github.com/imathis/octopress into testing-2.1

Conflicts:
	.rvmrc