some recent updates
Merge branch 'master' of https://github.com/axelmagn/dotfiles

Conflicts:
	_bashrc