Got the filetype and fileformat indicators to be one and dialed in some more on the colors
Reorganizing the git-related stuff in preparation for adding more git control