Generic wrapper classes makes themeing loads easier
Merge remote-tracking branch 'upstream/master'
Another one.
Typo
Merge pull request #105 from beardy-unixer/master

Make templates a tad easier to theme