Ask HN: something in between Jekyll and a social network?

I run a small company building hacker boards. Our website is based around Blogofile, which is a Python blog compiler like Jekyll. I love that the site is all static Markdown files, plus CSS and images. I love that I have the versioned history of the site on Github. Those parts make me very happy.

As time passes, the friction of blogging with a blog compiler is wearing on me. As an experiment, I tried Google+, and I really liked how easy it was for me to post a quick photo from my phone. But, I don't want to pile years of my work into Google+ (or Facebook, or similar), and then have it disappear when Google decides their core business is search.

I'd like a website that was stored as Markdown files (or something similarly future-proof), but with versioning and deployment more automated.

What alternatives exist in the middle? Do you have a good, non-proprietary, future-proof system?