Changes brought in from Spring2013

This *should* make it so that the master branch is fairly generalizable
for new sequencing projects. Ha. Ha. I'll believe it when I see it.