Merge pull request #89 from dannybutler/master

Client side changes
Merge pull request #90 from dannybutler/master

Make individual templates a bit clearer
Merge pull request #91 from dannybutler/master

Fixing metadata dictionary bug