support for the new _count format

Author: Mpdreamz

src/Nest/DSL/CountDescriptor.cs

@@ -5,19 +5,17 @@
 namespace Nest
 {
 	[DescriptorFor("Count")]
-	[JsonConverter(typeof(CustomJsonConverter))]
 	public partial class CountDescriptor<T> 
 		:	QueryPathDescriptorBase<CountDescriptor<T>, T, CountQueryString>
-		, IActAsQuery
 		, IPathInfo<CountQueryString> 
-		, ICustomJson
 		where T : class
 	{
-		BaseQuery IActAsQuery._Query { get; set; }
+		[JsonProperty("query")]
+		internal BaseQuery _Query { get; set; }
 
 		public CountDescriptor<T> Query(Func<QueryDescriptor<T>, BaseQuery> querySelector)
 		{
-			((IActAsQuery)this)._Query = querySelector(new QueryDescriptor<T>());
+			this._Query = querySelector(new QueryDescriptor<T>());
 			return this;
 		}
 
@@ -31,10 +29,5 @@ ElasticsearchPathInfo<CountQueryString> IPathInfo<CountQueryString>.ToPathInfo(I
 
 			return pathInfo;
 		}
-
-		object ICustomJson.GetCustomJson()
-		{
-			return ((IActAsQuery) this)._Query;
-		}
 	}
 }