Merge pull request #40 from l1ll1/aaf_auth

Aaf auth
Merge pull request #41 from l1ll1/aaf_auth

Aaf auth
Merge pull request #42 from l1ll1/aaf_auth

Aaf auth
Merge pull request #43 from l1ll1/aaf_auth

Aaf auth
Merge pull request #44 from l1ll1/aaf_auth

Aaf auth
Merge pull request #45 from l1ll1/aaf_auth

Aaf auth
Merge pull request #48 from l1ll1/aaf_auth

Aaf auth
Merge pull request #49 from l1ll1/master

bunch of changes
Merge pull request #50 from l1ll1/aaf_auth

Aaf auth
Merge pull request #51 from l1ll1/master

update to handle different authorized_keys files
Merge pull request #52 from l1ll1/aaf_auth

update cvlsshutils version
Merge pull request #53 from l1ll1/master

add a memory request element to the UI
Merge pull request #54 from l1ll1/master

give the ability for a siteconfig to change some of the labels, in parti...
pulling aaf_username from the wrong placE
Merge branch 'master' into aaf_auth
make aaf login work without setting a username
Merge pull request #55 from l1ll1/aaf_auth

Aaf auth
Merge branch 'master' into aaf_auth
Merge pull request #56 from l1ll1/aaf_auth

Aaf auth
Merge pull request #57 from l1ll1/master

update default settings in json