I second org-mode, being using it for years. I had to write a couple of scripts to update my notes to newer versions, but it went mostly painless. I however found myself using more and more plain text recently without much markups. There is certain mental ease and simplicity in writing:

    ed
    a
    Just write what's in my mind.
    .
    w now/figure/a/path/to/save
    q