Merge gitignore w/ stash.
Merge branch 'master' of https://github.com/Weltraumschaf/dotfiles