Hardcoding in a bundle

Entity API changed and is now requiring a bundle when the object is initially created. We need to remove this hardcode when we starting having more than one bundle.
Merge pull request #54 from tomfriedhof/bug-fix

Hardcoding in a bundle