Changed a few option names (check vimrc!)

Also improved the doc.