commit before push to github
cleanup for irods testing versus github
update sample settings.xml
testing PAM and irods4.0
changing to README for github
merging latest master to work on modeshape'
merging irods 4.0 compatible code
merge 3.3.2 master with iRODS 4.0 testing