Disable sweep2wake, because it's buggy
Reset git-cache so .gitignore works again
add HYPER gov

Conflicts:

	arch/arm/boot/compressed/piggy.xzkern