merge changes to formatting
Merge branch 'master' of https://github.com/jeberhardt/thoughtspot