Thanks for the reply.
I am sure that I have the same zimage with modules. I keep multiples in the same folder but I always rename the ones I am not using with a prefix.
I got it working again. It turns out my GPS was on.
Though, the quick settings app was telling me it was not on. I turned GPS off (the phone was able to sleep again), and Wifi worked once again. Odd.
Now for some reason, my lockscreen disappeared. I tried turning on the pattern recognition and it still doesn't turn on. Am I missing something or could this be a bug?