Pulled dev into master

Lots of updates, new datapackage spec.