Remove split between vi-compatible and vim options
Remove some vi-compatible comments and parameter