Updated makefile - fix merging errors
Updated golfu_defconfig for KitKat
- enabled SELinux support
- disabled hTC performance lock
- set MIN and MAX for CPU limit
- enabled KSM and swap to zTAM
Clean up