Add therubyracer
merging conflicts