Set tab stops.
Merge branch 'master' of github.com:cacack/dotfiles
Mergingin changes.