Move things around
Update the way we set the ISR
Rename AddIsrHandler->SetIsrHandler to better reflect its functionality
Disable unused ISR dynamically
Pointless
Merge remote-tracking branch 'origin/master'