some updates
Merge branch 'master' of github.com:PonderingGrower/dotfiles

Conflicts:
	.pentadactylrc