content pkg and shuffle intent handling
Merge branch 'master' of github.com:quarnster/completion