small tweaks to api and tests to try to track down unwanted upsert
merge upstream
again remove compiled sass partials and update .gitignore
Merge pull request #30 from GabeMedrash/master

update gitignore and working tree to prevent future merge conflicts