Standardized indentation.
Cleaned up merges.
Added /nick, cleaned up receive_chat_msg.