Merge: develop into master, iplant works
Merge branch 'develop'
rules/iplant.py: iput -T
Merge branch 'master' into develop