added .gitignore
Merge branch 'master' of https://github.com/dbroome/conduit

Merging prior to adding .gitignore