update vagrant to correctly move phpmyadmin
Merge remote-tracking branch 'upstream/master' into registry
Merge pull request #15 from mfairchild365/registry

Vagrant update