put back sprites
code cleanup
resolved merge conflicts
Merge branch 'seanewest-getting-it-running'