ignore .DS_Store
Annotated models
Merge branch 'master' of https://github.com/SocialCompass/locationer_gem