Shuffled settings, added git prompt support and tweaked the prompt itself.