added to gitignore
improved location clustering
Cleaned up some stuff