Update git-col settings
Update sublime settings
Add find_dropbox_conflicts alias
Add rar archives to extract function