Updated tintin
Merge branch 'master' of https://github.com/mattikus/dotfiles
Merge branch 'master' of https://github.com/mattikus/dotfiles