Merge pull request #32 from wisconsinpoet/bird_branch

Bird branch
slothed up some more shit