data types and such
Merge pull request #1190 from basho/lp/2.0-all-and-sundry

WIP: Random 2.0 fixes