layout and error page fixes
fix for version conflict. kombu is best auto-versioned as dependency of celery
Merge pull request #311 from grischa/develop

some small fixes