Acf4 updates

This a refactoring for ACF 4 that is working on a few of our installs. Would be happy to know if you see any issues.