Rethink vim-surround mappings
Clean up rc/plugins
Re-enable vim-run-live