rearranged users to avoid grace being in exposed list
Merge remote-tracking branch 'upstream/master'
Merge pull request #43 from MartyBurns/master

rearranged users to avoid grace hopper in dual role