changed vim diff colours

Change-Id: I14f9bdb922e41a6d95a5852751bf9a078d5dfdb0
added gundo, updated subs

Change-Id: I7895aa8ef1406805f3aae637381954244b573fc9