Test fixes for Mac on Chrome and Firefox
Minor cleanup
Merge branch 'consistentFonts' into macbook
Updates CHANGES.md
Merge master to macbook
Merge branch 'fixWriteTExtToCanvasSpec' into macbook
Merge remote-tracking branch 'origin/master' into macbook
Merge pull request #847 from AnalyticalGraphicsInc/macbook

Fix test failures on Mac
Fix typo in build file.
Merge branch 'master' into viewer
Merge branch 'viewer' into viewer-mixins