Done issue-11
Merge branch 'issue-11' of https://github.com/adamnagel/qudt-for-domain-tools into issue-11

Conflicts:
	qudt4dt/unit_mapping.py