Acl updates
Merge branch 'master' of git://github.com/wtangiit/Shock
Merge branch 'master' of git://github.com/wtangiit/Shock
Merge branch 'master' of github.com:MG-RAST/Shock
added allowable local paths to config, fixed permission denied bug
bug fix
Merge pull request #50 from jaredwilkening/master

ACL updates and security patch for local file paths