Refactored some stuff to make way for terrain and room generators.
Merge pull request #10 from ehalferty/master

A small update.