integrate with naarad, minor template enhancements
Merge branch 'reporting' of github.com:SharadGandhi/naarad into reporting