Added surround plugin, moved plugin configs to different file and added custom diff color