replaced rifraf with del
added merging option
added merged assets support
Merge pull request #61 from idleberg/2.0-dev

2.0 dev