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
Changed dirstack to work on python3
Merge branch 'master' of github.com:bricef/dotfiles
Merge remote-tracking branch 'origin'
Changes that slipped through the cracks when merging
Bashrc cleanup
Merge branch 'master' into raven