resolved conflicts and moved the rvm related PATH definition to os_specific, probably the best place for paths to live. if the order needs to be changed please fix accordingly
merged