updated CHANGELOG.markdown to reflect new version number
updated vagrant to 1.0.6 from http://github.com/mitchellh/vagrant-plugin
86ed old Gemfile.lock to get hpi built
updated version number
updated vagrant to 1.0.6 from http://github.com/mitchellh/vagrant-plugin
86ed old lockfile so the hpi would build
bumped version number, changed git:// to https:// so I can push/pull from/to github
reverted change from vagrant-1.1.0-dev and altered it to use vagrant 1.0.5
Merge pull request #30 from beefsalad/master

Add support for VirtualBox 4.2 without munging the JPI version, and using vagrant 1.0.5