switch from .Xdefaults to .Xresources loaded with xrdb -merge from .xsession
gitignore
Merge branch 'stow' of github.com:williamscales/dotfiles into stow

Conflicts:
	.gitignore
make sure .gitconfig itself stays out of git
updated prompt to include name
made vim use /tmp for backup files and swap files
added gopath ~/documents/go to zshrc
Merge branch 'stow' of github.com:williamscales/dotfiles into stow
added vim python mode
added vim python mode
added virtualenvwrapper to zshrc
Merge branch 'stow' into erdos

Conflicts:
	dotfiles.d/zsh/.zshrc