Ignoring VIM swap files
Merged origin/master