Merge pull request #15 from jamesblack/master

Some Fixes and a New System
Fixes bug that allowed you to carry items through teleportation.