Combined new package logic with bundle and rake resources

Combines #40 and #31