Vagrant working again, documented, tests added