dmenu: st -> termite
bashrc: swap git add and pull in alias
Merge branch 'master' of github.com:bananagranola/dotfiles

Conflicts:
	.echinus/echinusrc
	.xprofile