Hangouts 2.1 Merges SMS and Hangout Conversations in One Thread

Looks like Google finally addressed one of Josh's big gripes with messaging on the Nexus 5, and KitKat more generally.

Google Hangouts Update via Android Police