Tests for the path parser
Start refactoring the cartoon data sources
simplify servlets further
Merge commit with some fixes due to alternate histories