Added some project properties to ignore in local repos, refactored a bit