Update for new packaging style
Merge pull request #99 from GawainLynch/master

Update for new packaging style