Merge dotfiles

Encapsulation is good, but exposing students to bash conditionals is not so good.