added travis build status
Merge branch 'develop' of https://github.com/hypothesis/h into develop
make waffle and travis icons the same height
FINALLY got an annotation test working ; thanks for the help @csillag ; refs #565
Merge pull request #582 from edsu/develop

working annotation test