... added changes from "http://dotfiles.org/" -> need more work ...