Change matching brace plugin and add swift plugin
Ignore atom folder
Add kaleidoscope for diff and merge tools