Ignore .gitignore files too on merge
Update config names
Bugfix: main less file not watched