Completed merge of sample config into config.
Re-enabled passing config file as command line argument for testing.
enabled config to either be hard-coded or path via command argument when calling server.js
pulled latest from petajakarta-web
Updated web build as submodule within cognicity-server