Remedying .gitignore problem
Merge remote-tracking branch 'upstream/master'
Adding documentation for databases and cleaning things up