Merge pull request #20 from Eye-Static/andy

Data-binding finished (we hope), it's like sausages, you don't want to see how it's made
fixed tile-on-tile placement
Merge branch 'master' into andy