SIGINT handler for server tests that prevents zombie asyncore loop
Merge pull request #238 from girder/sigint-handler-in-tests

SIGINT handler for server tests that prevents zombie asyncore loop
Merge pull request #233 from girder/assetstore-management

Assetstore management
Merge remote-tracking branch 'origin/master' into s3-assetstore