Reverted some changes I was TESTING while doing an AOKP/PA simultaneous build,
tweaks to a few other settings I am TESTING