Merge pull request #194 from iameric1986/master

More mock server stuff
Fixed the mock server so that it will now load new messages added to it properly after the program is closed.