Add option for waking up the screen when a new SMS/MMS is received

Conflicts:
	res/values/strings.xml
	res/xml/preferences.xml
	src/com/android/mms/transaction/MessagingNotification.java
Fix merge derp and, while I'm at it, let's enable/disable
a couple options how I like them.