Remove the world
Merge branch 'master' of github.com:everett1992/dotfiles

Conflicts:
	home/.podcatcher/serverlist