asilano/free-dom — pull request #48 by alextfish (2012-08-07 10:03:35+00:00)
Title: Treasure Map + Throne Room

Okay. My trauma at the cherry-pick débâcle has worn off enough to try pushing this change up to you. I have no idea whether this is hanging from the right branch, or if that's even a concept that makes sense in Git. I'm happy to make any code review fixes you want, but I'm somewhat wary of trying to play with Git's merges to persuade it that the branch history is correct.