Fisrt bash at a template
Merge branch 'master' of github.com:waveform80/documentation
Seems to work nicely now...