Minor tweaks: add line highlighting in vim, install shutter, re-enable tpope surround plugin