2014-05-17 data update incorporation, WIP
Metadata tweaks for 2014-05-17 drop