Revert "database"

This reverts commit 51efdace500b4d80b62e27d1308b50e72e20f770.
Revert 51efdac..30e1f8c

This rolls back to commit 51efdace500b4d80b62e27d1308b50e72e20f770.
fout
Merge branch 'master' of https://github.com/janvdt/auto

This reverts commit 30e1f8c1c5edbdb538a73525948a4ab67c3eb85c.
Revert 8f86484..9cc96de

This rolls back to commit 8f8648404d163fd98cb8874e074321edc737c493.
jsongoed