submodulemessup
initial vagrant stuff
working for the most part
working
Merge branch 'vagrant'

Conflicts:
	mysite/code/Subtopic.php
	mysite/code/WorkOfArt.php