Minor rearrangements.
Merge branch 'master' of http://github.com/umitkablan/vims