Merge pull request #2 from Random832/master

Suggested changes (grammar etc)
overheard conversations and teleport location (refactored location prepositions)
Merge pull request #2 from eternaldensity/master

Merge