Fix KEXEC override - Thanks grondinm
Add shortsweep option to aroma
Merge pull request #2 from Tk-Glitch/cm-10.2

Pull TK's Changes