pentadactyl: Merge in changes by @holomorph, this makes the plugin compatible with vimperator and other small changes