Use Kaleidoscope for external diff and merge.
Moved apps (Atom and SublimeText) settings to Dropbox folder.
Merge branch 'master' of https://github.com/gmist/.files