changes for atlanta 2013
Merge pull request #480 from parkerd/master

changes for atlanta 2013