Moved to cyanogenmod config
Switched to att
Enabled loki
Fixing some naming
merge with cm-10.1 branch