everything is datapackage (following issue #24)
rm junk
Merge remote-tracking branch 'origin/master'