Starting on SLURM adaptor using Andre's as base...
Committing what I have so Andre can look at it :)
added pbs adaptor skeleton
Merge branch 'devel' into feature/pbsjob
sticking to naming convetions
Merge branch 'devel' into feature/slurm
added adaptor-specific tests
Python won't find my SLURM adaptor, committing for advice...  :)
add missing __init__.py.  Oh python...
Last update before Andre's merges...
Merge branch 'devel' into feature/slurm
merge from devel, disable local_job adaptor
Minor changes to let the SLURM adaptor compile with AM's changes
Minor changes, committing so I can test Andre's changes for the replica package
fixed decorator includes
Merge branch 'devel' into feature/pbsjob

Conflicts:
	docs/build/doctrees/adaptors/saga.adaptor.advert.redis.doctree
	docs/build/doctrees/adaptors/saga.adaptor.filesystem.local.doctree
	docs/build/doctrees/adaptors/saga.adaptor.index.doctree
	docs/build/doctrees/adaptors/saga.adaptor.localjob.doctree
	docs/build/doctrees/adaptors/saga.adaptor.myproxy.doctree
	docs/build/doctrees/adaptors/saga.adaptor.replica.irods.doctree
	docs/build/doctrees/adaptors/saga.adaptor.ssh.doctree
	docs/build/doctrees/adaptors/saga.adaptor.ssh_job.doctree
	docs/build/doctrees/adaptors/saga.adaptor.x509.doctree
	docs/build/doctrees/developers/adaptorwriting.doctree
	docs/build/doctrees/environment.pickle
	docs/build/doctrees/examples/index.doctree
	docs/build/doctrees/index.doctree
	docs/build/doctrees/library/advert/examples.doctree
	docs/build/doctrees/library/advert/index.doctree
	docs/build/doctrees/library/filesystem/examples.doctree
	docs/build/doctrees/library/filesystem/index.doctree
	docs/build/doctrees/library/index.doctree
	docs/build/doctrees/library/job/examples.doctree
	docs/build/doctrees/library/job/index.doctree
	docs/build/doctrees/library/replica/examples.doctree
	docs/build/doctrees/library/replica/index.doctree
	docs/build/doctrees/library/session.doctree
	docs/build/doctrees/library/url.doctree
	docs/build/doctrees/usage/config.doctree
	docs/build/doctrees/usage/examples.doctree
	docs/build/doctrees/usage/index.doctree
	docs/build/html/_downloads/localjobcontainer.py
	docs/build/html/_modules/index.html
	docs/build/html/_modules/saga/adaptors/local/dummyfile.html
	docs/build/html/_sources/adaptors/saga.adaptor.index.txt
	docs/build/html/_sources/adaptors/saga.adaptor.ssh_job.txt
	docs/build/html/_sources/usage/index.txt
	docs/build/html/adaptors/saga.adaptor.advert.redis.html
	docs/build/html/adaptors/saga.adaptor.dummysystem.local.html
	docs/build/html/adaptors/saga.adaptor.filesystem.local.html
	docs/build/html/adaptors/saga.adaptor.index.html
	docs/build/html/adaptors/saga.adaptor.replica.irods.html
	docs/build/html/adaptors/saga.adaptor.ssh_job.html
	docs/build/html/developers/adaptorwriting.html
	docs/build/html/genindex.html
	docs/build/html/index.html
	docs/build/html/library/advert/index.html
	docs/build/html/library/filesystem/index.html
	docs/build/html/library/index.html
	docs/build/html/library/job/examples.html
	docs/build/html/library/job/index.html
	docs/build/html/library/replica/index.html
	docs/build/html/library/url.html
	docs/build/html/objects.inv
	docs/build/html/py-modindex.html
	docs/build/html/searchindex.js
	docs/build/html/usage/examples.html
	docs/build/html/usage/index.html
	docs/build/html/usage/logger.html
	tests/adaptors/pbsjob/run_simple_job.py
Merge branch 'devel' into feature/pbsjob

Conflicts:
	tests/adaptors/pbsjob/run_simple_job.py
Merge branch 'devel' into feature/pbsjob
adaptor docs
trying to get my adaptor loaded