.gitignore .conkyrc and tmp
update
merged