trying to get more unit tests working
small change to influxdb template to support older versions of influxdb
Merge branch 'master' of github.com:torkelo/grafana