rewritten to seperate db from web server and some test files for vagrant added