generalize acf processing a bit
Merge branch 'master' of github.com:gitj/osf