gitignore
pentadactyl registers shouldn't be in git
some small tweaks
Merge branch 'master' of github.com:williamscales/dotfiles

Conflicts:
	Xdefaults
	pentadactyl/info/default/registers
	vimrc
	zshrc