added more smartDashboard buttons and renamed ShooterCock to PrepShooter for sanity's sake.
merged some conflicts. still no shooter subsystem.