* quick and dirty bundles.yaml to bundle.yaml fix
* cleanup
* review fixes
* code errors
* code improvement
Merge pull request #114 from urosj/bundleRename

Bundle quick and dirty fix