Cleaning house
More house cleaning
Merge branch 'corbin-setup'