Edited Shock server auth to accept (in this order) Globus and MG-RAST auth simultaneously.
Checking for the string "globus" in the token before actually validating the token with globus online
Refactored mgrast auth plug-in to work with current setup.
Added mgrast auth (commented out) to Shock config template file.
Merge pull request #240 from jaredbischof/master

Refactored mgrast auth plug-in to work with current setup.