Add xhprof directory to git ignore
Fix conflict
Tweak protalk-specific puppet files to get database created and seeded