Merge branch 'master' of github.com:MG-RAST/MG-RAST
Merge branch 'develop' of github.com:MG-RAST/MG-RAST into develop
Merge branch 'develop' of git@github.com:MG-RAST/MG-RAST into develop
added OAuth / globus auth to notebook API
broke up Auth module into more functions for accessing globus online in differnt ways
Merge pull request #284 from teharrison/develop

updates to oauth / globus auth in API for ipy notebook / shock usage
notebook / shock / oauth update - round 2
fixed imports
fix typos
fix LWP call, add more error messages
Merge pull request #285 from teharrison/develop

notebook / shock / oauth update - round 2
Added stronger language to warn users if they are submitting a dataset that already exists in MG-RAST and providing them with file size information.  Also, sending an e-mail to mg-rast if the user allows a duplicate submission of a job that is over a size limit (e.g. 1GB).
Merge pull request #286 from jaredbischof/develop

Added stronger language to warn users if they are submitting a dataset t...
notebook api: added type option for cloneing
Tested and debugged some errors with the duplicate submission warning that gets emailed to mg-rast.
Merge pull request #287 from jaredbischof/develop

Tested and debugged some errors with the duplicate submission warning th...
fixed utf-8 issue with notebnooks in shock
Merge pull request #288 from teharrison/develop

more notebook api fixes
Merge branch 'develop' of github.com:MG-RAST/MG-RAST
intial version of page tracking