magix and small shell fix
Merge branch 'master' of github.com:ledona/delano_setup

Conflicts:
	emacs/dot_emacs