about: Copyedit "Chief Delphi" and convert hyphens to ndashes
Merge pull request #1063 from mc10/templates

about: Copyediting
readme: Copyedit links, replace learn.github.com link

learn.github.com doesn't load, so I replaced that page with Try Git.
Proper linebreak after rookie year
Merge pull request #1064 from mc10/patch-1

readme: Copyedit links, replace learn.github.com link
fix for parsing CD's improperly escaped HTML
Merge remote-tracking branch 'upstream/master'
Add award enums to API. This allows for unique keys to be assigned to awards

Basically, this lets me do https://github.com/the-blue-alliance/the-blue-alliance-android/issues/196 for awards, also
update cache versions
add spaces. dammit vim
Merge pull request #1065 from phil-lopreiato/api-award-enum

Add award enums to API.
rename for consistency. updated apidocs
Update about
Merge branch 'master' into district-api

Conflicts:
	helpers/model_to_dict.py
finish merge?