updated versions for rbenv and update gemfile.lock via bundler
Merge branch 'master' of https://github.com/rvalente/rvalente.github.com

Conflicts:
	Gemfile.lock