Test for `+X11` before using clipboard=unnamedplus
Fix test for 'unnamedplus' again...
Merge branch 'pr/565' into 3.0

Fixes #564, #565
Merge branch '3.0' of https://github.com/spf13/spf13-vim into 3.0