The newest version of Google Hangouts for Android now merges SMS and non-SMS messages into a single stream in the same hangout. Yesssssssssss. The update is rolling out to the Google Play store this week, but there's an APK floating around already. Woooooo