Coding style changes
Fixes for erubis
Fixing test for 'passing objects to layout'