another round of optimization and additions
Merge branch 'master' of github.com:y0ast/dotfiles