added git aliases
updated dput config
added conky config