Merge branch 'bundle_import'

* bundle_import:
  easier bundle import, copied from project cypress
merged rake-export-jeff