wrong name for backupninja::pgsql and some template cleanups base don merge