updated conf files
Added --rebase option to git pull