Revise viminfo settings
Add sessionoptions
Add showmatch / matchtime settings
Merge branch 'master' into mac