More fixing and the like.
Merge branch 'master' of https://github.com/bjarkig/chav