Merge pull request #569 from jtakayama/master

Cleaned up Vagrant documentation: installation-makahiki-vagrant-environment-setup.rst
Merge pull request #570 from jtakayama/master

Updated installation-makahiki-vagrant-environment-setup.rst.