Small changes
Merge branch 'master' of github.com:Psirus/dotfiles

Conflicts:
	.bashrc
	.vimrc