updates

Signed-off-by: Alan Gardner <urfolomeus@gmail.com>
Merge branch 'master' of github.com:urfolomeus/dotfiles

Signed-off-by: Alan Gardner <urfolomeus@gmail.com>

Conflicts:
	bash/sections/aliases
	bashrc