remove references to vam and xiki
Merge branch 'master' of github.com:zenchicken/dotfiles