Fixed naming conventions, added beginning of conversation support
Implemented conversation functionality, figured out how to update db
entries
Merged with Master