[aorth]

Another vote for pass. I've been using it for ten years with a git repository. I sync to all my machines and use https://github.com/agrahn/Android-Password-Store on Android. Not a solution for non-technical people though...