fix dirstack syntax error in python3
Merge branch 'master' of github.com:bricef/dotfiles
change gitconfig email address
Merge branch 'master' of github.com:bricef/dotfiles

Conflicts:
	.gitconfig