added webkit2png and a couple of tweaks to some of the overall config
Merge branch 'master' of https://github.com/anatomic/dotfiles

Conflicts:
	.bashrc