Cleaned project.  Ready to merge