Merge pull request #1 from goldsmith/master

Cleaned up code
Expanded dictionary of responses
Added sources
Fixed formatting