Use a consistent party approach.
Merge branch 'master' of github.com:belowtheline/site