Thanks Kevin! The code is much cleaner and better documented than what ifi gives. The interrupts setup will be a great help to a lot of teams I am sure.
BTW, I have an updated version of my makefile to build this code if anyone is interested.
http://team997.org/files/software/Makefile_ifi_frc