Homer initial commit
lisa branch initial commit
Disco initial commit
Linode config merged
curlftpfs and grub cleaned out
Conflicts merge branch leela into disco
bash-completion added
fail2ban added
nagios added
lzip and libyaml added
munin added and nagios removed
add monit, tree and bc; remove emacs daemon and gentoo-syntax mode
NEW: mosh
Merge branch 'h3' into h2

Conflicts:
	world
h2 world cleanup
FIX: restore sys-devel/bc (used by bash prompt)
Merge remote-tracking branch 'origin/h2' into h3