Added install_conky to Makefile
Merge branch 'master' of https://github.com/flazzarini/dotfiles