bash: full path in prompt
vimrc: handle color column better
vim: desert-warm-256 make color column subtler
shot-lock: more pixels!
i3: add Dropbox daemon keybinding
vim: fix some colorscheme issues.

 quit using CSApprox, it disrupts proper 256 colorschemes.
 desert-256-warm statusline ctermbg was too close to backgroung
 colorcolumn was red
i3: switch font to Bitstream Vera Sans Mono
ssh: do not hash hostname so I can use completion
vim: switch colorscheme to desert256
make-links: handle existing files better
git: use kdiff3 as mergetool

Conflicts:
	gitconfig
prevent autoresolution of merge conflicts for kdiff3

Conflicts:
	gitconfig
i3: - multimonitor config. + laptop config

This branch will host configuration suitable for my laptop. Multimonitor
configuration doesn't cope well enough with what I want on my laptop and
viceversa.
vim: remove 'gutter' background desert-warm-256

Conflicts:
	vim/colors/desert-warm-256.vim
i3: add dropbox at startup

Conflicts:
	i3/config
i3: autostart nm-applet and gnome-sound
i3: autostart nm-applet and gnome-sound

79642873ba662c7f7736b589dad2c597d789f5f5
vim: switch colorscheme to desert-warm-256

Conflicts:
	vimrc
vim: get rid of some unused code

Conflicts:
	vimrc
i3: increase i3status update interval