modifications to draw_keypoint tests
Merge branch 'hesaff_setuptools' of github.com:Erotemic/hesaff into hesaff_setuptools
style changes
Added todos