vchoi_fork

Merge code from cache image branch to split FSM ring into two types: raw data
and metadata.  Also, some more ring reset safeties and minor code cleanups.