work on having management script create a user
Merge remote-tracking branch 'origin/master'