Merge pull request #573 from MG-RAST/develop

Update master
Merge pull request #576 from MG-RAST/develop

Update master
Merge pull request #591 from MG-RAST/develop

merge of develop code
Merge pull request #593 from MG-RAST/develop

added KBase user autogeneration
Merge pull request #596 from MG-RAST/develop

more shock updates: job delete and make public
Merge pull request #601 from MG-RAST/develop

test if shock and awe up before submitting
Merge pull request #603 from MG-RAST/develop

Removing pagination limit from AWE job query for progress page.
Merge pull request #607 from MG-RAST/develop

fix metagenome publish page
Merge pull request #610 from teharrison/develop

progress bar fixes / updates
Merge pull request #611 from MG-RAST/develop

fixes / updates
job delete: delete from AWE and while still in pipeline
add delete action to job api resource
metagenome resource: update pipeline parameters, allow minimal view while processing