Sitegen better

this should turn into a reviewboard eventually. for now, let's see how coveralled travis likes it.