Fix conflicted .gitignore config
Add .tm_properties to gitignore
Merge pull request #25 from good-juju/fix-gitignore

Fix gitignore