Run generic-users role on osf servers
Add tokumx role; add installation steps
Merge branch 'toku'