Update to match stable 20140704 release (and fix bug if config file doesn't exist)