improve subl mgt
added some plugins
resolve conflicts