Add rvm to path for scripting
Merge p4 config