Updates.
Merge branch 'master' of github.com:jalcine/rbenv

* 'master' of github.com:jalcine/rbenv:
  Tiny patching.

Conflicts:
	.gitmodules