Merge pull request #3 from WebFilings/jon/modulePrep

HYDRA-59 (Jon) bring the subtree up to date
Merge pull request #4 from WebFilings/jon/modulePrep

Bring in changes before 1.0.5
save buffer as image file
add comment explaining saveImage
add beginAnnotation() and endAnnotation()
Merge remote-tracking branch 'origin/dah/HYDRA-127__buffer_image' into jon/modulePrep

Conflicts:
	src/canvas.js