vim-patch:7.4.230+231

**vim-patch:7.4.230**
    
Problem:    Error when using ":options".
Solution:   Fix the entry for 'lispwords'. (Kenichi Ito)
    
https://code.google.com/p/vim/source/detail?r=57ecd7a8c0f052296b41b916eb1ae7

This has already been done with #938. This commit only changes version.c.

---

**vim-patch:7.4.231**

Problem:    An error in ":options" is not caught by the tests.
Solution:   Add a test for ":options".  Set $VIMRUNTIME for the tests so that
                it uses the current runtime files instead of the installed ones.
    
https://code.google.com/p/vim/source/detail?r=0a295a3c9e473512ad3b006a0fb752

This is the test for 7.4.230. I have changes the $SCRIPTSOURCE/$VIMRUNTIME to match the Neovim project structure.