GAAAHHH! Stupid login screen chime. Die in a fire, login screen chime, I
was relaxed until your sudden a unecessarily urgent ringing.
Merge branch 'master' of github.com:edthedev/dotfiles

Conflicts:
	minimal_vimrc