Fix powerline issue by reverting to last working commit. Minor consistency fix to .gitmodules.