vim bundles, tmux mouse
Merge branch 'master' of https://github.com/hspak/dotfiles

* 'master' of https://github.com/hspak/dotfiles:
  termite no transparency
  wallpaper
  not worth noting
merge
Merge remote-tracking branch 'origin/master'

* origin/master:
  dunst color change, typo xresources
Merge remote-tracking branch 'origin/master'

* origin/master:
  prettier prompt
Merge remote-tracking branch 'origin/master'

* origin/master:
  cleanup
time for color tweaks
Merge branch 'master' of https://github.com/hspak/dotfiles

* 'master' of https://github.com/hspak/dotfiles:
  conflict