Merge pull request #30 from GabeMedrash/master

update gitignore and working tree to prevent future merge conflicts
refactor api unit tests and confirm no upsert bug