Add window swap plugin
Set vim explicitly to avoid wrong exit codes