small fixes
Merge branch 'master' of github.com:tarmolov/configs

Conflicts:
	.bash/aliases.common.bash