Removed a couple of merge files that were hanging around.
Updated to v2.0 of the OpenMRS license and added updated license file.