Issue #12 - Updates to users and macrophage resources to fix index and test problems.