Merge remote-tracking branch 'jared/development' into genericParams

JavaIntegration/src/main/java/org/openzen/zencode/java/JavaNativeModule.java

 
 		//TypeVariableContext context = new TypeVariableContext();
 		TypeVariable<Class<T>>[] javaTypeParameters = cls.getTypeParameters();
-        TypeParameter[] typeParameters = new TypeParameter[cls.getTypeParameters().length];
+		TypeParameter[] typeParameters = new TypeParameter[cls.getTypeParameters().length];
 		definition.typeParameters = typeParameters;
+
 		for (int i = 0; i < javaTypeParameters.length; i++) {
 			//Put up here for nested parameters?
 			TypeVariable<Class<T>> typeVariable = javaTypeParameters[i];
 				TypeID type = loadType(context, bound).type;
 				parameter.addBound(new ParameterTypeBound(CodePosition.NATIVE, type));
 			}
-            typeParameters[i] = parameter;
+			typeParameters[i] = parameter;
 		}
 
 		if (!foundRegistry && definition instanceof ClassDefinition && cls.getAnnotatedSuperclass() != null && shouldLoadType(cls.getAnnotatedSuperclass().getType())) {
 				compiled.setImplementationInfo(member, new JavaImplementation(true, javaClass));
 			}
 		}
+
 		compiled.setClassInfo(definition, javaClass);
 
 		StoredType thisType = new StoredType(registry.getForMyDefinition(definition), AutoStorageTag.INSTANCE);