Spring Cleaning

Some minor changes to everything and some additional files regarding my
terminal settings.