merged latest markov from jocke-l/markov:master
Merge branch 'master' of github.com:jocke-l/memery

Conflicts:
	markov_src/Makefile