various small fixes, added bunny
Merge branch 'master' of github.com:orangeduck/teapot