bottlepy/bottle -> defnull/bottle
gittip repos
Merge pull request #2 from beyang/master

latest from upstream