Cleaned up splashtable, playing with memory allocations in play.cpp
Merge branch 'nick'