Add new rule to gitignore
Merge gitingore
Fix conkyrc
Add mocp config