Merge branch 'release/0.4'
Merge branch 'develop'
Merge branch 'hotfix/0.4.1'
Merge branch 'master' of https://github.com/splunk/splunk-heatwave-viz

Conflicts:
	.gitignore
Merge branch 'develop' of github.com:splunk/splunk-heatwave-viz into develop