PR updates

This adds in the most recent updates, as well as makes a few changes/updates for the acl branch. Biggest change is that the first installed user is an admin by default.