Merge branch 'master' of https://github.com/davidkbainbridge/opentsdb
undid format changes
Merge branch 'master' of http://github.com/davidkbainbridge/opentsdb