Revert changes to Resource for rain modules (#20)

* Add Overrides to Resources

* Add Mapping to Type

* Add Any to Type

* Revert changes to Resources

package/cloudformation.pkl

@@ -13,9 +13,7 @@ typealias RefString = String|Mapping
 /// 
 /// Any property that conflicts will be suffixed with `Property`.
 open class Resource {
-
-    // A Type is a Mapping when it's a Rain module
-    Type: String(matches(Regex(#"^.*::.*::.*$"#)))|Any
+    Type: String(matches(Regex(#"^.*::.*::.*$"#)))
     Properties: Any?
     CreationPolicy: Mapping? 
     DeletionPolicy: String?
@@ -24,9 +22,6 @@ open class Resource {
     UpdatePolicy: Mapping?
     UpdateReplacePolicy: String?
     Condition: String?
-
-    // Overrides is specific to Rain modules
-    Overrides: Mapping?
 }
 
 /// A CloudFormation Parameter

test/type-module.pkl

@@ -0,0 +1,17 @@
+// Represents a CloudFormation template that creates buckets
+// in several different ways, with and without the use of modules
+
+amends "modules/template.pkl"
+import "modules/cloudformation.pkl" as cfn
+import "modules/aws/s3/bucket.pkl" as bucket
+import "modules/patterns/bucket.pkl" as pattern
+
+Resources {
+
+    ["Mod"] {
+        Type {
+            ["!Rain::Module"] = "Something"
+        }
+    }
+}
+