Adds undies and Evil-undies costumes for Jeff
adds Troy pharaoh costume
Merge pull request #1695 from edisonout/pharaohs

Adds Troy pharaoh costume
Merge pull request #1693 from reddfawks/iseelondoniseefrance

Adds undies and Evil-undies costumes for Jeff
Merge branch 'master' of github.com:hawkthorne/hawkthorne-journey into autoupdate
Clean up after updates