Changed to get org-agend next working
Merging upstream hopefully
Merge branch 'master' of ssh://192.168.66.7/~/.live-packs