Added lots of stuff from ages ago and finalpost
Merge pull request #142 from h2g2guy/master

Added lots of stuff from ages ago and finalpost