complete reorg to use spf13 and prezto