Improved add entry dialog function.
Merge branch 'master' of https://github.com/diana134/afs
Clean up.
Fixed conflict
A r a dumb and need to stop clobbering things.