Toastdeib/mtg-familiar

Major cleanup of MTG Familiar. Work in progress!

JavaNOASSERTION