spacing cleanup
Create .gitignore

Why aren't we ignoring sqlite databases at this point?
Merge pull request #2947 from briankiewel/patch-1

spacing cleanup
Merge pull request #2951 from bworwa/patch-1

Create .gitignore
Merge remote-tracking branch 'upstream/master' into develop
Fix hardcoded primary key name