Update pudb conf
Remove git prompts...too slow!
Merge conflict