Add option for tiny dix
Merge branch 'master' of https://github.com/datascopeanalytics/dix

Conflicts:
	bin/dix
Goddamnit, @deanmalmgren, merge branch 'master' of https://github.com/datascopeanalytics/dix AGAIN

Conflicts:
	bin/dix