Switch to spf13
Updates