numerous small bugfixes
Merge pull request #8 from ericbmerritt/master

bug fixes and cleanup to the vagrant file.