Added detection of OS+version to determine whether to use emoji or not
Merge branch 'master' of https://github.com/datascopeanalytics/dix

Conflicts:
	bin/dix