Make SpinTomahawk uninterruptible
Map to 2 controllers, add xml thingies back, make SpinTomahawkinterrubptible again
Merge from origin/develop