Add [NAF] to terminal title
Improved sourcing of ekp/naf/user files