sync with ST2

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