update in light of DBNAME being fixed in scripts
re-add deleted files
Merge branch 'rabdureh' of https://github.com/ehagan/InfluxDB into rabdureh
Merge branch 'master' of https://github.com/ehagan/InfluxDB