git ignore vim temp files
Merge branch 'master' of github:schachmat/p2p_otr