Removed carousel from desktop PC
Fixed typo
Merge branch 'master' of github.com:ewancoder/dotfiles into notebook

Conflicts:
	.xscreensaver