Another merge before 108
Merge remote-tracking branch 'origin/dah/HYDRA-127__buffer_image' into jon/modulePrep

Conflicts:
	src/canvas.js
Merge pull request #6 from WebFilings/jon/modulePrep

Everything has been reviewed under its respective PCS tickets. Merging.