bare bones dotfiles getting started
fixed merge conflict in readme