Removed "qualifier" from bundle versions.

Also, normalized some of the files for lineending