history file added to ingore
Merge branch 'master' of github.com:novus42/.dotfiles
added smarttabs
added smarttabs