Knappsack R3 Release
Merge branch 'master' of https://github.com/ctco/knappsack into ctco-master