ignore vim swap files
Merge branch 'master' into websockets