Merge pull request #450 from surajnarwade/fix_context

Added consistency in build

Author: vdemeester

config/merge_v2.go

@@ -180,8 +180,13 @@ func resolveContextV2(inFile string, serviceData RawService) RawService {
 	} else {
 		current = path.Join(current, context)
 	}
-
-	build["context"] = current
+	if _, ok := serviceData["build"].(string); ok {
+		//build is specified as a string containing a path to the build context
+		serviceData["build"] = current
+	} else {
+		//build is specified as an object with the path specified under context
+		build["context"] = current
+	}
 
 	return serviceData
 }