Fix template import paths.
Remove the need to explicitly call add_options from base classes --
add_options from all base classes is now always called automatically.