add "CPU:" to conky
Renamed files and updated Makefile