Added a couple of nice refinements from guckes.net vim setup