Merge pull request #106 from jocke-l/master

fixed broken g.py (again... fuck you google)
Tidied up the striphtml lambda a bit
merged latest markov from jocke-l/markov:master