sync with ST2

https://github.com/code-orchestra/colt-sublime-plugin/commit/81b9de6067a45db710717f9fb7fdb6ee39bee262