Many small fixes and making it more compatible with the Origami spec
Merge pull request #4 from Financial-Times/origami-fixes

Many small fixes and making it more compatible with the Origami spec