cleaned up a bunch of build + formatting
diff --git a/frc971/crio/crio.gyp b/frc971/crio/crio.gyp
index b91b32d..330a6fa 100644
--- a/frc971/crio/crio.gyp
+++ b/frc971/crio/crio.gyp
@@ -29,6 +29,8 @@
         'WPILib_changes',
         '<(EXTERNALS):WPILib',
         '<(AOS)/common/messages/messages.gyp:aos_queues',
+        '<(AOS)/crio/controls/controls.gyp:ControlsManager',
+        '<(AOS)/crio/motor_server/motor_server.gyp:CRIOControlLoopRunner',
       ],
     },
     {
@@ -42,7 +44,6 @@
       'target_name': 'FRC_UserProgram_WithTests',
       'type': 'shared_library',
       'dependencies': [
-        'user_program',
         # For testing.
         '<(AOS)/build/aos_all.gyp:Crio',
       ],