change to chef zero
add git merge tool config
rstats desktop