Adding variable defaults if not set
Merge branch 'master' of github.com:schmooblez/Dixie-Street-Storage
Merge branch 'jdfreeman'