pentadactyl shortcut
Merge branch 'master' of github.com:delphinus35/dotfiles

Conflicts:
	.pentadactylrc