Added some love/death.
Merge branch 'master' of github.com:zqsd/dotfiles