update awesome rc file
put gitconfig in repo
fix merge!