Removed chaff that remains unchanged and causes conflicts with graphics version.
Merge branch 'master' of https://github.com/Putnam3145/fortbent