Move away from removed/deprecated lunchbox API
Merge pull request #264 from eile/master

Move away from removed/deprecated lunchbox API