Add 'add', 'replace' and 'extend' special options
Add fitting tests
Ignore VIM swap files