improve git ignore/include scheme