Merge pull request #11 from gregf/master

Update grafana to 1.6.0
Update CHANGELOG and add Greg Fitzgerald (@gregf) to contributors
Release version 1.0.5 with Grafana 1.6.0
Add emeril for easier cookbook releasing process
Bump to 1.0.6 for first community cookbook release
Fix merge conflict