Merge "Use seperate config file for p2p"