Mostly aesthetics
Merge branch 'master' of github.com:timwraight/Dotfiles

Conflicts:
	.pentadactylrc
	tim.zsh-theme