more gondor removal bits #116
Merge branch 'develop' of github.com:caktus/pycon into develop