Merge pull request #76 from jaredwilkening/master

cleaned up configuration, DB authentication, common db connection
Merge pull request #77 from jaredwilkening/master

authentication caching, new parellel client upload, fixed concurrency issues in server upload
Merge pull request #78 from jaredwilkening/master

client upload retry on failure and bug fix to server
Merge pull request #79 from jaredwilkening/master

server conf template update
Merge pull request #80 from jaredwilkening/master

minor bug fixes
Merge pull request #81 from jaredwilkening/master

controller re-organization
Delete shock.pl

- Looks like an outdated duplicate of shock.pm
Merge pull request #82 from devoid/master

I think you are right. Thanks.
Merge pull request #83 from jaredwilkening/master

minor bug fixes
Merge pull request #84 from jaredwilkening/master

fixed bug in checksums
Merge branch 'master' of github.com:MG-RAST/Shock
simplified libs