init
trying again
using update-alternatives
Merge branch 'ubulap'

Conflicts:
	dotfiles/bashrc