fix collision between generated properties names and corresponding types names

add Uri Scalar
Merge branch 'master' of github.com:vasily-kirichenko/FSharp.Data.Experimental.YamlTypeProvider