first pass of merging zoes code with my own
Added IrodsStorage class and fixed things for iRODS 4.0.2
Merge branch 'master' of https://github.com/JeffHeard/django_irods

Conflicts:
	icommands.py
	models.py
	tasks.py
	views.py
Merge branch 'jeff_zoe_merge'

Conflicts:
	tasks.py
	views.py