As a slight enhancement on pure text files: Org-mode [1] for Emacs! I really only use the outlining, and sometimes the TODO-item support, but having nice navigation/subtree folding on top of a file that's still plain text is really great.

I have a few three-line scripts in my ~/bin that commit my Org files to a git repo and push to my remote server, or pull changes. Lets me have copies on multiple machines and works really well.

[1] http://orgmode.org/