Added Vagrant support.
Updated documentation.
Updated bootstrap.sh
Merge branch 'vagrant'