updates
Merge branch 'master' of github.com:skryl/dot

Conflicts:
	common/home/.vimrc