Merged latest .vim from austinf

Signed-off-by: Michael Welter <michael@cetoncorp.com>