Merge pull request #12 from lnussel/master

add test-data to vhost
also remove now obsolete config from Makefile