Merge pull request #590 from teharrison/develop

merge of shock code
added KBase user autogeneration
Merge pull request #592 from paczian/develop

added KBase user autogeneration
Merge pull request #594 from teharrison/develop

possible fix
Merge pull request #595 from teharrison/develop

more shock updates: job delete and make public
test if shock and awe up before submitting