+= tonic, isnic
Merge branch 'master' of github.com:pgollucci/home

Conflicts:
  .gitconfig