too many whiches... brought out the pitchfork
Merge branch 'master' of gh:project-douglas/eris-site