Merge pull request #5 from csdl/master

Pulling in upstream changes from the main csdl branch.
Merge branch 'master' of http://github.com/csdl/makahiki
Fixed links in Vagrant documentation and updated some version numbers. Latest installation test used Vagrant 1.6.2 and VirtualBox 4.3.12.
Some text cleanup in the Vagrant documentation.
Typo fix in the Vagrant documentation.
Merge pull request #607 from jtakayama/master

Installation confirmed to work in Vagrant 1.6.2. Minor link fixes.