Merge vServer into trunk
Add yaml-cpp library