Merge pull request #2 from cookiej4u/master

Merge from upstream.
YAML employed.
Use central stylesheets (no inline css!)