Fix Simyo APN, Remove Blau ES

Per https://jira.cyanogenmod.org/browse/CYAN-3313

Change-Id: Ic723fa99d85d542e20cccfc3a91f69bd1cdbbea0
Merge remote-tracking branch 'cyanogen/cm-11.0' into cm-11.0