Merge to upstream branch by default
Fix config syntax for new version
Remove perhost bashrc