converted to py2/3 with future
imports not working as is, had to add source. to 'dicom'
removed 2to3 conversion in setup
Merge branch 'master' into develop

Conflicts:
	source/setup.py
moved dicom folder to root along with setup (in hopes of using it with travis
updated readme