Cleaned up connection bootstrapping

Still sucks.
Merge pull request #11 from kyleterry/feature/look_for_end_motd_on_connect

Cleaned up connection bootstrapping