Removed some of the bloat.
Merge branch 'master' of github.com:guillermoandrae/dotfiles

* 'master' of github.com:guillermoandrae/dotfiles:
  Fixed tabs again, cleared out some errors
  Deleted an old file, changed tabs to 4