linux fixes
Merge branch 'master' of https://github.com/scoiatael/config

Conflicts:
	vim/vimrc