Add builded and vim files to .gitignore
Resolve .gitignore merge