Johtaylo 1335 odata dep

fixes #1335 

1) rewrite of code that pulls in Odata.Contrib
2) replace System.Data.Service.* with Microsoft.Data.Services.* equivallent
3) moves odata upto 5.5