assorted charon changes
Merge branch 'master' of /home/will/git/dotfiles