Added AnnotationPoints, AnnotationLines
Annotation updates

* Refactored AnchoredAnnotation draw method
  * Annotations now just need to provide draw_annotated()
* Allow text annotations to be scaled when zooming
* Allow points NOT to be scaled when zooming
* Line updates
  * Changed line type (Real,Real,Real,Real) -> ((Real,Real),(Real,Real))
  * Allow user to specify order of point coordinates for
    matrices with four rows
Fixed up font face scaling.
Fix non-scaled point drawing
Fix set_valid, minor rearrangment of annotation.jl
Added documentation for annotations

* This is slightly incomplete, because I haven't tested FloatingAnnotations
Merge pull request #27 from kmsquire/annotation_pts_lines

RFC: Added AnnotationPoints, AnnotationLines
README: smooth description of script usage
Fix bugs in scalebar and document it
Fix bug when drawing multiple point or line annotations
Renaming: display->view, delete_annotation! -> delete!

Also fix test deprecations
Merge branch 'master' into gtkmerge

Conflicts:
	test/annotations.jl
Fix typo in annotation_isvalid
Fix playback speed popup
Fix deprecation warning in entry widget
Fix typo in annotation_isvalid
Renaming: display->view, delete_annotation! -> delete!

Also fix test deprecations

Conflicts:
	src/ImageView.jl
	test/annotations.jl
Merge pull request #29 from timholy/teh/rename

Renaming: display->view, delete_annotation! -> delete!
Add test/REQUIRE (fix #30)
Add write_to_png for exporting images