smux2anki, new programs, vimrc
Merge branch 'master' of https://github.com/palkakrzysiek/scripts

Conflicts:
	ubuntu-programs.sh
upd