Relocate assets, simplify, other things.
Merge pull request #2 from matttproud/refactor/packaging/asset-inclusion

Relocate assets, simplify, other things.