Added more toys.
Merge branch 'master' of github.com:gdey/dotfiles

Conflicts:
	vim/vimrc