Much awesomeness from mikemilano

Extending and implementing terminus_session_select_data() all over the place. 

A little more cleanup on hostnames.