tweaks for atlanta 2013
Merge pull request #533 from parkerd/master

tweaks for atlanta 2013