made xinitrc on spock host-specific, too
Merge branch 'master' of https://github.com/cgie/dotfiles