Updates from 0x vim color scheme and swap subl with mate