Ngdoc tidyup

Tidied up ngDoc further, focusing on wording of the gridOptions and columnDefs.

Merged the latest master into it, so in theory should be an easy merge.

Have removed all the (optional) notes against the columnDefs, as there is only one mandatory property.  Have instead marked that one as (mandatory).