Add wrap shortcut
Remove walkaround for YCM