Latest from geddy master including swig templating - and a fix for scaffolding