Don't perform recursive update with git psu.
Use meld as mergetool.
Ignore gedit swap files.
Merge branch 'master' of git://github.com/herr-biber/dotfiles
Add gtest-parallel script.
Use temp file and count failed tests.
Use Mikas tmux.conf.