some changes
Merge branch 'master' of github.com:brynjagr/dotfiles

Conflicts:
	.bashrc
	.my_configs.vim