Ruby setup
Vagrant init
adding berkshelf and chef-solo with omnibus
adding cookbooks
adding name to vm
setting up mysql
adding sqlite
setting up Ruby with rbenv
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore