add support to parallels in Vagrantfile
Merge branch 'master' of github.com:rancherio/rancher into HEAD