small improvements
Merge branch 'master' of github.com:miguelgrinberg/api-pycon2014