Cleanup after merge

Master is now XNA 4.0
Changed item storage and generation