jq binary (pkgsrc won't build)
Merge branch 'master' of https://github.com/ucldc/appstrap
tricky build for ffmpeg
Merge branch 'master' of https://github.com/ucldc/appstrap

Conflicts:
	stacks/nuxeo.pkgsrc.txt
	stacks/stack_nuxeo