Cleaned up project after rebasing and merging branches and repositories.