Working vagrant file w/ updated vagrant box
Updated VagrantFile to use sporkd2/salt-master
Merge branch 'berno' of http://github.com/sporkd2/salting into matt