Initial swift support
Swift Support and Cleanup

This commit adds initial swift support. It also cleans up some areas as
well as brings in some changes that were made in the RedHat branch.