Dotfiles update from crystal.
Merge branch 'master' of github.com:gunsch/dotfiles