Merged in bdavenport/dump1090/MapRefactorSettings  in to dump1090 folder.
Also modified server json dump