modified Vagrant file to look in local dir for vagrant.yml.  removed vagrant .yml from git since it is supposed to be a file with local properties for each person who is staning up a vagrant vm
fixed syntax error in Vagrantfile
changed yaml.load_file call to use path relative to the Vagrantfile location