Add matchit / surround, slim down readme