Replace amo_user by user, simplyfing some code along the way (bug 1030981)

https://bugzilla.mozilla.org/show_bug.cgi?id=1030981
heh, updating commented out code. Nice.