Merged fixes from kjoconnor.

src/icalendar/cal.py

@@ -578,7 +578,7 @@ class Calendar(Component):
     """
 
     name = 'VCALENDAR'
-    canonical_order = ('PRODID', 'VERSION', 'CALSCALE', 'METHOD',)
+    canonical_order = ('VERSION', 'PRODID', 'CALSCALE', 'METHOD',)
     required = ('prodid', 'version', )
     singletons = ('prodid', 'version', )
     multiple = ('calscale', 'method', )

src/icalendar/prop.py

@@ -1449,7 +1449,7 @@ class TypesFactory(CaselessDict):
     # These are the default types
     types_map = CaselessDict({
         ####################################
-        # Property valye types
+        # Property value types
         # Calendar Properties
         'calscale' : 'text',
         'method' : 'text',