removed ping method that was for testing only
added limit to streaming output to avoid crashes
removed un-necessary config database code now that it is file-driven
Merge remote-tracking branch 'origin/exp' into exp