Bump grafana to 1.6.1
Merge pull request #14 from gregf/master

Bump grafana to 1.6.1