added linediff to vim, modified conky
Merge branch 'master' of github.com:junkmechanic/dotfiles