Fix git submodule location and update spf13