Fixed missing sublime shortcut
Merged master into vertigo