Adjustments for new directory structure.
Update Vagrant to 1.3.5.
Various adjustments for new directory structure.
Further work on vagrant adjustments.
Further vagrant adjustments.
Merge branch 'branch-1-0'

Conflicts:
	vagrant/shares/httpd/www_root/cache/mapcache.xml