Improvements to vim-patch script.
Merge pull request #1740 from fwalch/improve-vimpatch

Minor improvements to vim-patch script.