cherrypick git cherry-pick cbb16501fd336dd587a6459896f4a47630575a0a from jbarnette/master: "Get Some Religion"
cherrypick git cherry-pick cbb16501fd336dd587a6459896f4a47630575a0a
from jbarnette/master: "Get Some Religion"

tsnow/dotfiles,tsnow/dotfiles,tsnow/dotfiles