add rbenv and rvm dotfiles to gitinore
fix some typos
merge with vagrant-1-3-x branch
some modifications and add magic floavor creation