Adding pantheon defaults and cleaning up some of our own code.
Merge branch 'master' of github.com:Caveat4U/Arapahoe-HS-7