Directory
Configuration file
Cleaned up commands and settings, and added a bunch of printouts
Merge remote-tracking branch 'origin/master'