Code review comment for lp:~jblount/libubuntuone/classy-error-pages

> Looks ok to me, although I just merged another branch that adds a new page
> (initial page when loading the real store), so I think this is going to have
> conflicts, so can you please merge with trunk and add that other page please?

I merged with trunk, but could you please once over it and make sure I didn't get rid of anything?