DataSet.toContext() now properly unpacks alpha values from color ImageDataSets
build
Merge branch 'master' into dataset-bug

Conflicts:
	lib/data.min.js
Merge branch 'dataset-bug'
agents opacity scales by distance to the sun
scaleOpacity function, sets agent color to return from u.scaleOpacity
scaleOpacity function, sets patch color to return from u.scaleOpacity
return color with new opacity by scaling a value of rgba. Rounds scaled opacity to the thousandth digit
Merge branch 'Caroisawesome-color_scale_fix'
Fix for Shapes not being referred to in Util & misc EOL spaces
Begin sweep of Docco generated comments in core coffee files
Next round of documentation updates
Fix Template model, updates to color (still in beta)
- The template model was broken by a PR commenting out two lines
- The two lines were user defined image shapes, which failed w file: urls
- The fix: simply check for file: protocol and skip image based user shapes
- Absolutely amazing this was not done initially!
- Color updates, but still in flux
Merge branch 'upstream-master' into evented

Conflicts:
	src/model.coffee