vagrant boxes with correct name
fixes db connection
Merge branch 'master' into untangling

Conflicts:
	README.md
Merge branch 'untangling'