Database orders setup

Also includes gitignore and getting rid of some merge issues.