Merge branch 'master' into notan

keeping things up to date. lets not have any annoying conflicts to fix later.

src/main.rs

@@ -138,6 +138,7 @@ fn setup(gfx: &mut Graphics) -> State {
     gs.ecs.register::<Key>();
     gs.ecs.register::<WantsToRemoveKey>();
     gs.ecs.register::<WantsToDelete>();
+    gs.ecs.register::<IntrinsicChanged>();
     gs.ecs.register::<SimpleMarker<SerializeMe>>();
     gs.ecs.register::<SerializationHelper>();
     gs.ecs.register::<DMSerializationHelper>();