add git-cascade
Merge branch 'master' of github.com:blovett/dotfiles

Conflicts:
	.gitmodules