Add vim swap files to .gitignore
Merge remote-tracking branch 'moc-ssh/devel' into devel