Complete merge and upgrade on it's way

Not ready to be committed yet but already contains a merge of all the outstanding pull requests and also others which aren't.  

I've made quite a bit of improvement:
Full data support including json
hierarchical DnD
Sensitivity adjustment
Optimizations
data- enabled
and much much more.

Was hoping to be done with it already but then life got in the way. Your patience for another week, 2 at the most.