Remove ui/webui/ssl from package_data since it doesn't exist
add some mimetype support in improve the merge_changes.py script