Incorporation of the Tile Editor w/ obstacles

EDIT: Joel, please do not merge Mark's commit. I have incorporated both my and Mark's work into my commit. Could you also tell him about this? Thanks.