Fix upgrade that doesn't set the CATTLE_AGENT_IP
Set image version to master
add support to parallels in Vagrantfile.
Merge branch 'master' of github.com:AntonioMeireles/rancher
Merge remote-tracking branch 'upstream/master'