merged cleanup
config file
merged submodule
Merge branch 'master' of github.com:MG-RAST/RetinaDemo
merged submodule