Merge pull request #4 from varunchitre15/cm-11.0

Some necessary changes
Merge pull request #7 from freexperia/cm-11.0

Merge with fxp upstream
misc cleanup

Signed-off-by: Varun Chitre <varun.chitre15@gmail.com>