Add jfltecan (S4 Canadian)
Build own Trebuchet
add device options for m7